gobject-introspection r949 - trunk/tests/everything

[walters svn gnome org]

Author: walters
Date: Wed Nov 19 20:11:31 2008
New Revision: 949
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=949&view=rev

Log:
Switch everything to .tgir convention

We want to be using .tgir and g-ir-generate like the other cool kids;
the --typelib-xml option to the scanner is not at all the same thing.

Modified:
   trunk/tests/everything/Makefile.am

Modified: trunk/tests/everything/Makefile.am
==============================================================================
--- trunk/tests/everything/Makefile.am	(original)
+++ trunk/tests/everything/Makefile.am	Wed Nov 19 20:11:31 2008
@@ -26,7 +26,7 @@
 
 GIRS =
 TYPELIBS = $(GIRS:.gir=.typelib)
-TXMLS = $(GIRS:.gir=.gir.txml)
+TXMLS = $(GIRS:.gir=.tgir)
 CLEANFILES = $(TYPELIBS) $(TXMLS) $(GIRS)
 BUILT_SOURCES = $(TYPELIBS) $(TXMLS) $(GIRS)
 
@@ -42,4 +42,6 @@
 
 %.typelib: %.gir $(top_builddir)/tools/g-ir-compiler$(EXEEXT) Makefile
 	$(top_builddir)/tools/g-ir-compiler --includedir=. --includedir=$(top_builddir)/gir $< -o $@
-	PYTHONPATH=$(SCANNER_PYTHONPATH) $(SCANNER) --add-include-path=$(top_builddir)/gir --typelib-xml $< > $<.tmp && mv $<.tmp $<.txml
+
+%.tgir: %.typelib $(top_builddir)/tools/g-ir-generate$(EXEEXT) Makefile
+	 $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $< -o $@