[evolution-data-server] Introspection cleanups.

[Matthew Barnes <mbarnes src gnome org>]

commit 8b1bac15b7eb6cd7b6b9896ebde6f7aa53297649
Author: Matthew Barnes <mbarnes redhat com>
Date:   Fri Nov 2 17:47:38 2012 -0400

    Introspection cleanups.

 addressbook/libebook/Makefile.am |   58 +++++++++++++++++++++++---------------
 calendar/libecal/Makefile.am     |   26 +++++++++++++---
 libedataserver/Makefile.am       |   21 +++++++++++--
 3 files changed, 73 insertions(+), 32 deletions(-)
---
diff --git a/addressbook/libebook/Makefile.am b/addressbook/libebook/Makefile.am
index 2c253f4..95d1b01 100644
--- a/addressbook/libebook/Makefile.am
+++ b/addressbook/libebook/Makefile.am
@@ -96,36 +96,48 @@ pkgconfig_DATA = libebook-$(API_VERSION).pc
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/libedataserver \
-	--add-include-path=$(srcdir) --identifier-prefix=E --pkg-export \
-	libebook-1.2 --c-include="libebook/libebook.h"
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libedataserver \
-	--includedir=$(srcdir)
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(top_builddir)/libedataserver \
+	--add-include-path=$(srcdir) \
+	--identifier-prefix=E \
+	--pkg-export libebook-1.2 \
+	--c-include="libebook/libebook.h" \
+	$(NULL)
+INTROSPECTION_COMPILER_ARGS = \
+	--includedir=$(top_builddir)/libedataserver \
+	--includedir=$(srcdir) \
+	$(NULL)
 
 if HAVE_INTROSPECTION
 introspection_sources = $(libebook_1_2_la_SOURCES)
 EBook-1.2.gir: libebook-1.2.la
 
-EBook_1_2_gir_INCLUDES = GObject-2.0 GLib-2.0 libxml2-2.0 \
-	Gio-2.0 \
-	$(NULL)
+EBook_1_2_gir_INCLUDES = GObject-2.0 GLib-2.0 libxml2-2.0 Gio-2.0
 libxml_include = `$(PKG_CONFIG) --cflags libxml-2.0`
-EBook_1_2_gir_CFLAGS = $(INCLUDES) \
-		       $(libxml_include) \
-		       -I$(top_srcdir) \
-		       -I$(top_builddir) \
-		       -I$(top_srcdir)/addressbook/ \
-		       -I$(top_builddir)/addressbook/ \
-		       -I$(top_srcdir)/addressbook/libebook \
-		       -I$(top_builddir)/addressbook/libebook \
-		       -DLIBEBOOK_COMPILATION \
-		       $(EVOLUTION_ADDRESSBOOK_CFLAGS) \
-		       $(CAMEL_CFLAGS) \
-			$(NULL)
-EBook_1_2_gir_SCANNERFLAGS = --include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir
+EBook_1_2_gir_CFLAGS = \
+	$(INCLUDES) \
+	$(libxml_include) \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-I$(top_srcdir)/addressbook/ \
+	-I$(top_builddir)/addressbook/ \
+	-I$(top_srcdir)/addressbook/libebook \
+	-I$(top_builddir)/addressbook/libebook \
+	-DLIBEBOOK_COMPILATION \
+	$(EVOLUTION_ADDRESSBOOK_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
+EBook_1_2_gir_SCANNERFLAGS = \
+	--include-uninstalled=$(top_builddir)/libedataserver/EDataServer-1.2.gir \
+	$(NULL)
 EBook_1_2_gir_LIBS = \
-	libebook-1.2.la $(top_builddir)/libedataserver/libedataserver-1.2.la
-EBook_1_2_gir_FILES = $(libebook_1_2_la_SOURCES) $(libebookinclude_HEADERS)
+	libebook-1.2.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(NULL)
+EBook_1_2_gir_FILES = \
+	$(libebook_1_2_la_SOURCES) \
+	$(libebookinclude_HEADERS) \
+	$(NULL)
 
 INTROSPECTION_GIRS += EBook-1.2.gir
 
diff --git a/calendar/libecal/Makefile.am b/calendar/libecal/Makefile.am
index 9bf4759..609f0e8 100644
--- a/calendar/libecal/Makefile.am
+++ b/calendar/libecal/Makefile.am
@@ -91,9 +91,15 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --add-include-path=$(top_builddir)/libedataserver --identifier-prefix E --pkg-export libecal-1.2 \
-	--c-include="libecal/libecal.h"
-INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libedataserver
+INTROSPECTION_SCANNER_ARGS = \
+	--add-include-path=$(top_builddir)/libedataserver \
+	--identifier-prefix E \
+	--pkg-export libecal-1.2 \
+	--c-include="libecal/libecal.h" \
+	$(NULL)
+INTROSPECTION_COMPILER_ARGS = \
+	--includedir=$(top_builddir)/libedataserver \
+	$(NULL)
 
 if HAVE_INTROSPECTION
 
@@ -102,8 +108,18 @@ introspection_sources = \
 
 ECalendar-1.2.gir: libecal-1.2.la
 ECalendar_1_2_gir_INCLUDES = GObject-2.0 EDataServer-1.2 GLib-2.0
-ECalendar_1_2_gir_CFLAGS = $(libecal_INCLUDES) -DLIBECAL_COMPILATION $(EVOLUTION_CALENDAR_CFLAGS) $(CAMEL_CFLAGS)
-ECalendar_1_2_gir_LIBS = libecal-1.2.la $(top_builddir)/calendar/libegdbus/libegdbus-cal.la $(top_builddir)/libedataserver/libedataserver-1.2.la $(top_builddir)/camel/libcamel-1.2.la
+ECalendar_1_2_gir_CFLAGS = \
+	$(libecal_INCLUDES) \
+	-DLIBECAL_COMPILATION \
+	$(EVOLUTION_CALENDAR_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(NULL)
+ECalendar_1_2_gir_LIBS = \
+	libecal-1.2.la \
+	$(top_builddir)/calendar/libegdbus/libegdbus-cal.la \
+	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(NULL)
 ECalendar_1_2_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += ECalendar-1.2.gir
 
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 44111a0..4d20f6f 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -200,8 +200,11 @@ DISTCLEANFILES = eds-version.h				\
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS =
-INTROSPECTION_SCANNER_ARGS = --identifier-prefix E --pkg-export \
-	libedataserver-1.2  --c-include="libedataserver/libedataserver.h"
+INTROSPECTION_SCANNER_ARGS = \
+	--identifier-prefix E \
+	--pkg-export libedataserver-1.2 \
+	--c-include="libedataserver/libedataserver.h" \
+	$(NULL)
 INTROSPECTION_COMPILER_ARGS =
 
 if HAVE_INTROSPECTION
@@ -211,8 +214,18 @@ introspection_sources = \
 
 EDataServer-1.2.gir: libedataserver-1.2.la
 EDataServer_1_2_gir_INCLUDES = GObject-2.0 libxml2-2.0 Gio-2.0
-EDataServer_1_2_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) -DLIBEDATASERVER_COMPILATION $(E_DATA_SERVER_CFLAGS) $(CAMEL_CFLAGS) $(SOUP_CFLAGS)
-EDataServer_1_2_gir_LIBS = libedataserver-1.2.la $(top_builddir)/camel/libcamel-1.2.la
+EDataServer_1_2_gir_CFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_builddir) \
+	-DLIBEDATASERVER_COMPILATION \
+	$(E_DATA_SERVER_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(SOUP_CFLAGS) \
+	$(NULL)
+EDataServer_1_2_gir_LIBS = \
+	libedataserver-1.2.la \
+	$(top_builddir)/camel/libcamel-1.2.la \
+	$(NULL)
 EDataServer_1_2_gir_FILES = $(introspection_sources)
 INTROSPECTION_GIRS += EDataServer-1.2.gir