[gobject-introspection] build: Fix scanner/compiler to look in $(top_builddir) now

[Colin Walters <walters src gnome org>]

commit 270677b2a8bbea473bb0904df35bab6340758bb9
Author: Colin Walters <walters verbum org>
Date:   Thu Nov 11 09:54:35 2010 -0500

    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.

 common.mk         |    8 ++++----
 tests/Makefile.am |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/common.mk b/common.mk
index 3514d72..2620c45 100644
--- a/common.mk
+++ b/common.mk
@@ -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 2c4c547..32c3522 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