[libgdata/introspection-makefile] introspection: UNFINISHED work to port to Makefile.introspection



commit b5701829110ec10a060099d9c9b620b8aef28ca9
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sun Aug 22 18:15:10 2010 +0100

    introspection: UNFINISHED work to port to Makefile.introspection

 Makefile.am |   51 +++++++++++++++++++++++++++------------------------
 1 files changed, 27 insertions(+), 24 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fa6dd43..fb85e2e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -410,37 +410,40 @@ gdata_libgdata_la_LDFLAGS = \
 EXTRA_DIST += gdata/gdata.symbols
 
 # Introspection
+-include $(INTROSPECTION_MAKEFILE)
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --warn-all --c-include="gdata/gdata.h"
+INTROSPECTION_COMPILER_ARGS =
+DISTCHECK_CONFIGURE_FLAGS += --enable-introspection
+EXTRA_DIST += introspection.m4
+
 if HAVE_INTROSPECTION
-_gir_libtool = $(if $(LIBTOOL),--libtool="$(LIBTOOL)") # bgo#610273
-gdata/GData-$(GDATA_API_VERSION).gir: Makefile gdata/libgdata.la
-	$(AM_V_GEN)($(INTROSPECTION_SCANNER)						\
-	--namespace GData --nsversion=$(GDATA_API_VERSION) --warn-all			\
-	--c-include="gdata/gdata.h" --include=libxml2-2.0 --include=Soup-2.4		\
-	--library=gdata/libgdata.la $(_gir_libtool) --quiet --output $@			\
-	-I$(top_srcdir) -I$(top_srcdir)/gdata $(GDATA_CFLAGS)				\
-	$(addprefix $(srcdir)/,$(gdatainclude_HEADERS) $(gdataatominclude_HEADERS)	\
-	$(gdataappinclude_HEADERS) $(gdatagdinclude_HEADERS)				\
-	$(gdatagcontactinclude_HEADERS) $(gdatamediainclude_HEADERS)			\
-	$(gdatacalendarinclude_HEADERS) $(gdatacontactsinclude_HEADERS)			\
-	$(gdatadocumentsinclude_HEADERS) $(gdatapicasawebinclude_HEADERS)		\
-	$(gdatayoutubeinclude_HEADERS) $(gdata_sources)))
-BUILT_GIRSOURCES = gdata/GData-$(GDATA_API_VERSION).gir
+gir_version = $(subst .,_,$(GDATA_API_VERSION))
+gdata/GData-$(GDATA_API_VERSION).gir: gdata/libgdata.la
+gdata_GData_$(gir_version)_gir_INCLUDES = GObject-2.0 libxml2-2.0 Soup-2.4
+gdata_GData_$(gir_version)_gir_CFLAGS = $(INCLUDES)
+gdata_GData_$(gir_version)_gir_LIBS = gdata/libgdata.la
+gdata_GData_$(gir_version)_gir_FILES = $(addprefix $(srcdir)/,$(gdatainclude_HEADERS) $(gdataatominclude_HEADERS)	\
+	$(gdataappinclude_HEADERS) $(gdatagdinclude_HEADERS)					\
+	$(gdatagcontactinclude_HEADERS) $(gdatamediainclude_HEADERS)				\
+	$(gdatacalendarinclude_HEADERS) $(gdatacontactsinclude_HEADERS)				\
+	$(gdatadocumentsinclude_HEADERS) $(gdatapicasawebinclude_HEADERS)			\
+	$(gdatayoutubeinclude_HEADERS) $(gdata_sources))
+
+INTROSPECTION_GIRS += gdata/GData-$(GDATA_API_VERSION).gir
 
 girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
+gir_DATA = $(INTROSPECTION_GIRS)
 
-typelibsdir = $(libdir)/girepository-1.0/
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
-%.typelib: %.gir
-	$(AM_V_GEN)($(INTROSPECTION_COMPILER) --includedir=$(top_srcdir)/gdata --includedir=. $(INTROSPECTION_COMPILER_ARGS) $< -o $@)
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
 
-CLEANFILES += \
-	$(gir_DATA)	\
-	$(typelibs_DATA)
+#gdata/GData-$(GDATA_API_VERSION).gir: Makefile gdata/libgdata.la
+#	-I$(top_srcdir) -I$(top_srcdir)/gdata $(GDATA_CFLAGS))
 
-DISTCHECK_CONFIGURE_FLAGS += --enable-introspection
-EXTRA_DIST += introspection.m4
+#	$(AM_V_GEN)($(INTROSPECTION_COMPILER) --includedir=$(top_srcdir)/gdata
 endif
 
 # gcov



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]