gir-repository r71 - trunk/gir

[walters svn gnome org]

Author: walters
Date: Sun Aug 31 16:06:10 2008
New Revision: 71
URL: http://svn.gnome.org/viewvc/gir-repository?rev=71&view=rev

Log:
Fix includes, use --includedir, comment out nonworking test

	* gir/Makefile.am: Fix includes, use --includedir,
	comment out nonworking test


Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Sun Aug 31 16:06:10 2008
@@ -19,6 +19,7 @@
 Pango.gir: $(G_IR_SCANNER) 
 	$(G_IR_SCANNER) -v --namespace Pango \
             --include=GObject.gir \
+            --include=cairo.gir \
             --library=pango-1.0 \
 	    $(NOCLOSURE) \
             --output $@ \
@@ -346,20 +347,22 @@
 	@rm -fr $(BUILT_GIRSOURCES)
 
 %.typelib: %.gir 
-	$(DEBUG) $(G_IR_COMPILER) $(G_IR_COMPILER_OPTS) $< -o $@
+	$(DEBUG) $(G_IR_COMPILER) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
 
 %.typelib.gdb: %.gir 
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< -o $@
 
+CLEANFILES += $(typelibs_DATA:.typelib=.typelib.xml) $(typelibs_DATA:.typelib=.typelib.xml.typelib)
+
 TESTS = tests.py
 
 EXTRA_DIST += $(TESTS)
 
 check-local: $(typelibs_DATA)
 	@for x in $(typelibs_DATA); do \
-         echo $$x; \
-	 echo $(G_IR_GENERATE) $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
-	 $(G_IR_GENERATE) $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
-	 echo $(DEBUG) $(G_IR_COMPILER) $${x}.xml -o $${x}.xml.typelib; \
-	 $(DEBUG) $(G_IR_COMPILER) $${x}.xml -o $${x}.xml.typelib; \
+         echo 1>&2 $$x; \
+	 echo 1>&2 $(DEBUG) $(G_IR_GENERATE) --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
+	 $(DEBUG) $(G_IR_GENERATE) --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
+	 #echo 1>&2 $(DEBUG) $(G_IR_COMPILER) --includedir=. $${x}.xml -o $${x}.xml.typelib; \
+	 #$(DEBUG) $(G_IR_COMPILER) --includedir=. $${x}.xml -o $${x}.xml.typelib; \
 	done