gobject-introspection r823 - in trunk: gir tests tests/invoke tests/scanner

[tko svn gnome org]

Author: tko
Date: Wed Oct 29 10:13:16 2008
New Revision: 823
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=823&view=rev

Log:
distcheck fixes

	* gir/Makefile.am:
	* tests/Makefile.am:
	* tests/invoke/Makefile.am:
	* tests/scanner/Makefile.am: Add missing files to EXTRA_DIST and
	CLEANFILES, reference files using $(srcdir)

Modified:
   trunk/gir/Makefile.am
   trunk/tests/Makefile.am
   trunk/tests/invoke/Makefile.am
   trunk/tests/scanner/Makefile.am

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Oct 29 10:13:16 2008
@@ -32,9 +32,9 @@
 	    $(srcdir)/glib-2.0.c \
 	    $(GLIB_INCLUDEDIR)/glib/*.h
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
-	    --xpath-assertions=GLib-2.0.xpath GLib-2.0.gir	
+	    --xpath-assertions=$(srcdir)/GLib-2.0.xpath GLib-2.0.gir
 BUILT_SOURCES += GLib-2.0.gir
-EXTRA_DIST += GLib-2.0.xpath
+EXTRA_DIST += glib-2.0.c GLib-2.0.xpath
 
 # gobject
 GOBJECT_INCLUDEDIR=`pkg-config --variable=includedir gobject-2.0`/glib-2.0
@@ -114,6 +114,7 @@
 	    $(srcdir)/gio-2.0.c \
 	    $(GLIB_INCLUDEDIR)/gio/*.h
 BUILT_SOURCES += Gio-2.0.gir
+EXTRA_DIST += gio-2.0.c
 CLEANFILES = $(BUILT_SOURCES)
 
 girdir=$(datadir)/gir

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Wed Oct 29 10:13:16 2008
@@ -28,7 +28,7 @@
 	@echo Testing $<:
 	$(DEBUG) $(top_builddir)/tools/g-ir-compiler --includedir=$(top_builddir)/gir $< > $*.1
 	$(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=$(top_builddir)/gir $*.1 > $*.2
-	diff -u $*.gir $*.2 && rm $*.1 $*.2
+	diff -u $(srcdir)/$*.gir $*.2 && rm $*.1 $*.2
 
 
 check-local: $(GIRTESTS)

Modified: trunk/tests/invoke/Makefile.am
==============================================================================
--- trunk/tests/invoke/Makefile.am	(original)
+++ trunk/tests/invoke/Makefile.am	Wed Oct 29 10:13:16 2008
@@ -29,5 +29,5 @@
 
 TESTS = invoke invoke-namespace-find.sh
 
-EXTRA_DIST = invoke-namespace-find.sh testfns.gir
+EXTRA_DIST = invoke-namespace-find.sh testfns-1.0.gir
 

Modified: trunk/tests/scanner/Makefile.am
==============================================================================
--- trunk/tests/scanner/Makefile.am	(original)
+++ trunk/tests/scanner/Makefile.am	Wed Oct 29 10:13:16 2008
@@ -32,9 +32,10 @@
 TYPELIBS = $(GIRS:.gir=.typelib)
 CHECKGIRS = $(GIRS:.gir=.gir.check)
 EXPECTEDGIRS = $(GIRS:.gir=-expected.gir)
+TGIRS = $(GIRS:.gir=.tgir)
 CHECKTGIRS = $(GIRS:.gir=.tgir.check)
 EXPECTEDTGIRS = $(GIRS:.gir=-expected.tgir)
-CLEANFILES = $(TYPELIBS)  $(GIRS)
+CLEANFILES = $(TYPELIBS)  $(GIRS) $(TGIRS)
 BUILT_SOURCES = $(TYPELIBS) $(GIRS)
 EXTRA_DIST = $(EXPECTEDGIRS) $(EXPECTEDTGIRS)
 
@@ -66,8 +67,9 @@
 
 drawable-injected-1.0.gir: drawable-1.0.gir $(SCANNER) $(SCANNER_LIBS) Makefile
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(CHECK_DEBUG) $(SCANNER) -v \
-	 --inject drawable-1.0.gir DrawableAdditions.xml $@
+	 --inject drawable-1.0.gir $(srcdir)/DrawableAdditions.xml $@
 GIRS += drawable-injected-1.0.gir
+EXTRA_DIST += DrawableAdditions.xml
 
 foo-1.0.gir: libfoo.la foo.c foo.h utility-1.0.gir $(SCANNER) $(SCANNER_LIBS) Makefile
 	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(CHECK_DEBUG) $(SCANNER) -v \
@@ -140,6 +142,6 @@
 	 echo 1>&2 "$(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml;"; \
 	 $(DEBUG) $(top_builddir)/tools/g-ir-generate --includedir=. --includedir=$(top_builddir)/gir $${x} > $${x}.tmp && mv $${x}.tmp $${x}.xml; \
 	done
-CLEANFILES += $(TYPELIBS:.typelib:.typelib.xml)
+CLEANFILES += $(TYPELIBS:.typelib=.typelib.xml)
 
 check-local: post-check