diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | gir/Makefile.am | 6 | ||||
| -rw-r--r-- | giscanner/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/scanner/Makefile.am | 4 |
6 files changed, 30 insertions, 8 deletions
@@ -1,3 +1,13 @@ +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. + 2008-08-27 Johan Dahlin <johan@gnome.org> * giscanner/Makefile.am: diff --git a/Makefile.am b/Makefile.am index d0f12626..72b25df4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,5 +26,9 @@ man_MANS = docs/g-ir-scanner.1 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 diff --git a/gir/Makefile.am b/gir/Makefile.am index b88ea3c3..6b306bb5 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -15,7 +15,7 @@ GLIB_LIBRARY=glib-2.0 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 @@ GOBJECT_LIBRARY=gobject-2.0 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 @@ GIO_LIBRARY=gio-2.0 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 $@ \ diff --git a/giscanner/Makefile.am b/giscanner/Makefile.am index 6d8c43df..91e1772c 100644 --- a/giscanner/Makefile.am +++ b/giscanner/Makefile.am @@ -88,3 +88,8 @@ _giscanner.so: _giscanner.la 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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 37df1c26..57e07873 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,6 +3,7 @@ SUBDIRS = . invoke scanner EXTRA_DIST = \ array.gir \ boxed.gir \ + constant.gir \ enum.gir \ errors.gir \ function.gir \ @@ -25,9 +26,9 @@ GIRTESTS = \ %.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 diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index bd62a364..5383b998 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -25,8 +25,10 @@ SCANNER_LIBS = \ 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 @@ GIRS += utility.gir 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..." |