diff options
| author | Colin Walters <walters@verbum.org> | 2010-11-11 09:54:35 -0500 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2010-11-11 09:54:35 -0500 |
| commit | 270677b2a8bbea473bb0904df35bab6340758bb9 (patch) | |
| tree | 0c0f7a6ca361241dadefe7778b2afe5224294f18 | |
| parent | 84608743897ef60071757c09216f60f8861f504e (diff) | |
| download | gobject-introspection-270677b2a8bbea473bb0904df35bab6340758bb9.tar.gz | |
build: Fix scanner/compiler to look in $(top_builddir) now
Since we're nonrecursive, the build artifacts live in $(top_builddir),
so look there now for files like Gio-2.0.gir.
| -rw-r--r-- | common.mk | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -16,13 +16,13 @@ INTROSPECTION_SCANNER_ARGS = \ --verbose \ -I$(top_srcdir) \ --add-include-path=$(srcdir) \ - --add-include-path=$(top_srcdir)/gir \ + --add-include-path=$(top_srcdir) \ --add-include-path=$(builddir) \ - --add-include-path=$(top_builddir)/gir + --add-include-path=$(top_builddir) INTROSPECTION_COMPILER = $(top_builddir)/g-ir-compiler$(EXEEXT) INTROSPECTION_COMPILER_ARGS = \ --includedir=$(srcdir) \ - --includedir=$(top_srcdir)/gir \ + --includedir=$(top_srcdir) \ --includedir=$(builddir) \ - --includedir=$(top_builddir)/gir + --includedir=$(top_builddir) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2c4c5475..32c3522c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -47,7 +47,7 @@ Everything-1.0.gir: libeverything-1.0.la Makefile $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \ --namespace=Everything --nsversion=1.0 \ --libtool="$(LIBTOOL)" \ - --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \ + --add-include-path=$(top_builddir) --include=Gio-2.0 \ --library=libeverything-1.0.la --output=$@ \ everything.h everything.c @@ -55,7 +55,7 @@ GIMarshallingTests-1.0.gir: libgimarshallingtests-1.0.la Makefile $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate \ --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 \ --libtool="$(LIBTOOL)" \ - --add-include-path=$(top_builddir)/gir --include=Gio-2.0 \ + --add-include-path=$(top_builddir) --include=Gio-2.0 \ --library=libgimarshallingtests-1.0.la --output=$@ \ $(srcdir)/gimarshallingtests.h $(srcdir)/gimarshallingtests.c |