gobject-introspection r507 - in trunk: . gir giscanner tests tests/scanner

[johan svn gnome org]

Author: johan
Date: Thu Aug 28 10:02:23 2008
New Revision: 507
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=507&view=rev

Log:
2008-08-28  Johan Dahlin  <johan gnome org>

    * Makefile.am:
    * configure.ac:
    * gir/Makefile.am:
    * giscanner/Makefile.am:
    * tests/Makefile.am:
    * tests/scanner/Makefile.am:
    Make distcheck pass.



Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/gir/Makefile.am
   trunk/giscanner/Makefile.am
   trunk/tests/Makefile.am
   trunk/tests/scanner/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Aug 28 10:02:23 2008
@@ -26,5 +26,9 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gobject-introspection-1.0.pc
 
-EXTRA_DIST = $(pkgconfig_DATA)
+EXTRA_DIST = 			\
+	$(pkgconfig_DATA)	\
+	$(man_MANS)		\
+	misc/pep8.py		\
+	misc/pyflakes.py
 

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Thu Aug 28 10:02:23 2008
@@ -15,7 +15,7 @@
 endif
 
 GLib.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
-	PYTHONPATH=$(top_srcdir):$$PYTHONPATH $(G_IR_SCANNER) \
+	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
 	    -v --namespace GLib \
 	    --noclosure \
 	    --output $@ \
@@ -41,7 +41,7 @@
 endif
 
 GObject.gir: GLib.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
-	PYTHONPATH=$(top_srcdir):$$PYTHONPATH $(G_IR_SCANNER) \
+	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
 	    -v --namespace GObject \
 	    --noclosure \
 	    --output $@ \
@@ -66,7 +66,7 @@
 endif
 
 Gio.gir: GObject.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES)
-	PYTHONPATH=$(top_srcdir):$$PYTHONPATH $(G_IR_SCANNER) \
+	PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \
 	    -v --namespace Gio \
 	    --noclosure \
 	    --output $@ \

Modified: trunk/giscanner/Makefile.am
==============================================================================
--- trunk/giscanner/Makefile.am	(original)
+++ trunk/giscanner/Makefile.am	Thu Aug 28 10:02:23 2008
@@ -88,3 +88,8 @@
 	ln -sf .libs/_giscanner.so .
 
 include $(top_srcdir)/gcov.mak
+
+check-local:
+	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
+	   cp $(top_srcdir)/giscanner/*.py $(top_builddir)/giscanner; \
+	fi

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Thu Aug 28 10:02:23 2008
@@ -3,6 +3,7 @@
 EXTRA_DIST = \
 	array.gir	\
 	boxed.gir	\
+	constant.gir	\
 	enum.gir	\
 	errors.gir	\
 	function.gir	\
@@ -25,9 +26,9 @@
 
 %.gir.test: %.gir
 	@echo Testing $<:
-	$(DEBUG) $(top_builddir)/tools/g-ir-compiler $< > $<.1; \
-	$(DEBUG) $(top_builddir)/tools/g-ir-generate $<.1 > $<.2; \
-	diff -u $< $<.2; rm $<.1 $<.2
+	$(DEBUG) $(top_builddir)/tools/g-ir-compiler $< > $*.1; \
+	$(DEBUG) $(top_builddir)/tools/g-ir-generate $*.1 > $*.2; \
+	diff -u $< $*.2; rm $*.1 $*.2
 
 check-local: $(GIRTESTS)
 	@echo Running PEP8 on Python sources

Modified: trunk/tests/scanner/Makefile.am
==============================================================================
--- trunk/tests/scanner/Makefile.am	(original)
+++ trunk/tests/scanner/Makefile.am	Thu Aug 28 10:02:23 2008
@@ -25,8 +25,10 @@
 TYPELIBS = $(GIRS:.gir=.typelib)
 TXMLS = $(GIRS:.gir=.gir.txml)
 CHECKGIRS = $(GIRS:.gir=.gir.check)
+EXPECTEDGIRS = $(GIRS:.gir=-expected.gir)
 CLEANFILES = $(TYPELIBS) $(TXMLS) $(GIRS)
 BUILT_SOURCES = $(TYPELIBS) $(TXMLS) $(GIRS)
+EXTRA_DIST = $(EXPECTEDGIRS)
 
 %.gir: lib%.la %.c %.h utility.gir $(SCANNER) $(SCANNER_LIBS) Makefile
 	$(CHECK_DEBUG) $(SCANNER) -v \
@@ -53,7 +55,7 @@
 
 pre-check:
 	@if test "$(top_builddir)" != "$(top_srcdir)"; then \
-	   cp $(top_srcdir)/giscanner/*.py $(top_builddir)/giscanner; \
+	   cp -f $(top_srcdir)/giscanner/*.py $(top_builddir)/giscanner; \
 	fi
 	@echo "Running scanner checks..."