gir-repository r178 - trunk/gir

[tko svn gnome org]

Author: tko
Date: Thu Oct 30 11:43:10 2008
New Revision: 178
URL: http://svn.gnome.org/viewvc/gir-repository?rev=178&view=rev

Log:
distcheck fixes

	* gir/Makefile.am (EXTRA_DIST): add XPATH_TESTS
	(dist_gir_DATA, gir_DATA): split BUILT_GIRSOURCES out of
	distributed .gir files so that 'make dist' doesn't require
	building all optional dependencies.
	(%.xpath.test): reference files in $(srcdir)

Modified:
   trunk/gir/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Oct 30 11:43:10 2008
@@ -1,5 +1,5 @@
 CLEANFILES =
-EXTRA_DIST =
+EXTRA_DIST = $(XPATH_TESTS)
 lib_LTLIBRARIES =
 COMMON_CUSTOM_LDFLAGS= -module -avoid-version -rdynamic
 
@@ -669,7 +669,8 @@
 endif BUILD_BABL
 
 girdir = $(GIRDIR)
-dist_gir_DATA = $(CUSTOM_GIRSOURCES) $(BUILT_GIRSOURCES)
+dist_gir_DATA = $(CUSTOM_GIRSOURCES)
+gir_DATA = $(BUILT_GIRSOURCES)
 
 typelibsdir = $(TYPELIBDIR)
 typelibs_DATA = $(dist_gir_DATA:.gir=.typelib)
@@ -685,7 +686,7 @@
 %.xpath: %.gir
 
 %.xpath.test: %.xpath
-	$(G_IR_SCANNER) --xpath-assertions=$*.xpath $*.gir
+	$(G_IR_SCANNER) --xpath-assertions=$(srcdir)/$*.xpath $*.gir
 
 %.typelib: %.gir
 	$(DEBUG) $(G_IR_COMPILER) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@