diff options
| author | Colin Walters <walters@src.gnome.org> | 2008-10-16 01:40:29 +0000 |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2008-10-16 01:40:29 +0000 |
| commit | c3d732b2c2393a14ed9bda1e5a2e17745c94ca54 (patch) | |
| tree | 3dd71bc56c4defb6d7f1a0ef7597922ab8dd17bb /gir | |
| parent | 1f1ca54b3a41713b9328f0824f59d18c3ef7ffd2 (diff) | |
| download | gobject-introspection-c3d732b2c2393a14ed9bda1e5a2e17745c94ca54.tar.gz | |
Merge branch 'bug556331-includecleanup'
svn path=/trunk/; revision=724
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/Makefile.am | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gir/Makefile.am b/gir/Makefile.am index a945f7f5..59caad75 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -17,6 +17,7 @@ endif GLib-2.0.gir: $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ -v --namespace GLib --nsversion=2.0 \ + --add-include-path=. \ --noclosure \ --output $@ \ --strip-prefix=g \ @@ -45,10 +46,11 @@ endif GObject-2.0.gir: GLib-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ -v --namespace GObject --nsversion=2.0 \ + --add-include-path=. \ --noclosure \ --output $@ \ --strip-prefix=g \ - --include=$(top_builddir)/gir/GLib-2.0.gir \ + --include=GLib-2.0 \ --library=$(GOBJECT_LIBRARY) \ -I$(GOBJECT_INCLUDEDIR) \ -I$(GOBJECT_LIBDIR)/glib-2.0/include \ @@ -70,10 +72,11 @@ endif GModule-2.0.gir: GLib-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ -v --namespace GModule --nsversion=2.0 \ + --add-include-path=. \ --noclosure \ --output $@ \ --strip-prefix=g \ - --include=$(top_builddir)/gir/GLib-2.0.gir \ + --include=GLib-2.0 \ --library=$(GMODULE_LIBRARY) \ -I$(GMODULE_INCLUDEDIR) \ -I$(GMODULE_LIBDIR)/glib-2.0/include \ @@ -94,10 +97,11 @@ endif Gio-2.0.gir: GObject-2.0.gir $(G_IR_SCANNER) $(G_IR_SCANNER_FILES) Makefile PYTHONPATH=$(top_builddir):$$PYTHONPATH $(G_IR_SCANNER) \ -v --namespace Gio --nsversion=2.0 \ + --add-include-path=. \ --noclosure \ --output $@ \ --strip-prefix=g \ - --include=$(top_builddir)/gir/GObject-2.0.gir \ + --include=GObject-2.0 \ --library=$(GIO_LIBRARY) \ -I$(GIO_INCLUDEDIR) \ -I$(GIO_LIBDIR)/glib-2.0/include \ |