gir-repository r245 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Wed Nov 26 01:50:37 2008
New Revision: 245
URL: http://svn.gnome.org/viewvc/gir-repository?rev=245&view=rev

Log:
Remove hand-rolled .typelib.xml code

Modified:
   trunk/ChangeLog
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Nov 26 01:50:37 2008
@@ -945,8 +945,9 @@
 typelibsdir = $(TYPELIBDIR)
 typelibs_DATA = $(CUSTOM_GIRSOURCES:.gir=.typelib) $(BUILT_GIRSOURCES:.gir=.typelib)
 
-CLEANFILES += $(typelibs_DATA)
+TGIRS = $(typelibs_DATA:.typelib=.tgir)
 
+CLEANFILES += $(typelibs_DATA)
 
 clean-gir:
 	@rm -fr $(BUILT_GIRSOURCES)
@@ -962,14 +963,9 @@
 %.typelib.gdb: %.gir
 	libtool --mode=execute gdb --args $(G_IR_COMPILER) $< -o $(@F)
 
-CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA:.typelib=.typelib.xml) $(typelibs_DATA:.typelib=.typelib.xml.typelib)
+%.tgir: %.typelib $(G_IR_GENERATE) Makefile
+	 $(DEBUG) $(G_IR_GENERATE) --includedir=$(srcdir) --includedir=. $< -o $@
+
+CLEANFILES += $(BUILT_GIRSOURCES) $(TGIRS)
 
-check-local: $(typelibs_DATA) $(XPATH_TESTS:.xpath=.xpath.test)
-	@failed=; for x in $(typelibs_DATA); do \
-         x=$(builddir)/`basename $${x}`; \
-	 echo 1>&2 "$(DEBUG) $(G_IR_GENERATE) --includedir=$(builddir) --includedir=$(srcdir) $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml;"; \
-	 $(DEBUG) $(G_IR_GENERATE) --includedir=. $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml || failed="$${failed} $${x}"; \
-	done; \
-	test -z "$${failed}" || { \
-	  echo "FAIL:$${failed}"; exit 1; \
-	}
+check-local: $(TGIRS)