diff options
| author | Johan Dahlin <jdahlin@async.com.br> | 2008-10-30 02:07:43 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-10-30 02:07:43 +0000 |
| commit | 845f179db5ec240316f960c8c77b31a69aecc561 (patch) | |
| tree | 6df15f283cbbec2581f189a7ae2d8d41fc673718 /gir | |
| parent | 7a89d675ec370fd824be73a33750b1089e48c835 (diff) | |
| download | gobject-introspection-845f179db5ec240316f960c8c77b31a69aecc561.tar.gz | |
Bug 558383 – builddir != srcdir build fails if giscanner python module
2008-10-30 Johan Dahlin <jdahlin@async.com.br>
Bug 558383 – builddir != srcdir build fails if giscanner python module not already installed
* gir/Makefile.am:
construct PYTHONPATH just once
* tests/everything/Makefile.am:
* tests/scanner/Makefile.am:
add $(top_srcdir) to PYTHONPATH to
handle builddir != srcdir
* giscanner/libtoolimporter.py:
* giscanner/sourcescanner.py:
Make the libtoolimporter work when distchecking too.
Mostly based on patch by Tommi Komulainen
svn path=/trunk/; revision=833
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/Makefile.am | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index 0b6a93a8..437adbf9 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -2,6 +2,7 @@ BUILT_SOURCES = EXTRA_DIST = G_IR_SCANNER = $(top_srcdir)/tools/g-ir-scanner +G_IR_SCANNER_PYTHONPATH = $(top_builddir):$(top_srcdir):$$PYTHONPATH G_IR_SCANNER_FILES = $(top_srcdir)/giscanner/*.py \ $(top_builddir)/giscanner/libgiscanner.la @@ -16,7 +17,7 @@ GLIB_LIBRARY=glib-2.0 endif GLib-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile glib-2.0.c - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ + PYTHONPATH=$(G_IR_SCANNER_PYTHONPATH) $(G_IR_SCANNER) \ -v --namespace GLib --nsversion=2.0 \ --add-include-path=. \ --noclosure \ @@ -31,7 +32,7 @@ GLib-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile glib-2.0.c $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ $(srcdir)/glib-2.0.c \ $(GLIB_INCLUDEDIR)/glib/*.h - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ + PYTHONPATH=$(G_IR_SCANNER_PYTHONPATH) $(G_IR_SCANNER) \ --xpath-assertions=$(srcdir)/GLib-2.0.xpath GLib-2.0.gir BUILT_SOURCES += GLib-2.0.gir EXTRA_DIST += glib-2.0.c GLib-2.0.xpath @@ -47,7 +48,7 @@ GOBJECT_LIBRARY=gobject-2.0 endif GObject-2.0.gir: GLib-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ + PYTHONPATH=$(G_IR_SCANNER_PYTHONPATH) $(G_IR_SCANNER) \ -v --namespace GObject --nsversion=2.0 \ --add-include-path=. \ --noclosure \ @@ -73,7 +74,7 @@ GMODULE_LIBRARY=gmodule-2.0 endif GModule-2.0.gir: GLib-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ + PYTHONPATH=$(G_IR_SCANNER_PYTHONPATH) $(G_IR_SCANNER) \ -v --namespace GModule --nsversion=2.0 \ --add-include-path=. \ --noclosure \ @@ -98,7 +99,7 @@ GIO_LIBRARY=gio-2.0 endif Gio-2.0.gir: GObject-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile $(srcdir)/gio-2.0.c - PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ + PYTHONPATH=$(G_IR_SCANNER_PYTHONPATH) $(G_IR_SCANNER) \ -v --namespace Gio --nsversion=2.0 \ --add-include-path=. \ --noclosure \ |