[gtk+] Add --add-include-path to find just-built .gir files

[Colin Walters <walters src gnome org>]

commit d986066cb539686358d2812f5206d36c5892baad
Author: Colin Walters <walters verbum org>
Date:   Fri Jun 25 12:14:12 2010 -0400

    Add --add-include-path to find just-built .gir files

 gdk/Makefile.am |    2 +-
 gtk/Makefile.am |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index b2b0c51..b8ac4a3 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -219,7 +219,7 @@ x11_introspection_files = \
         x11/gdkx.h
 
 GdkX11-3.0.gir: $(gdktargetlib) Makefile
-GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11 --add-include-path=../gdk-pixbuf
+GdkX11_3_0_gir_SCANNERFLAGS = --strip-prefix=gdk_x11 --add-include-path=../gdk-pixbuf --add-include-path=.
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-3.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = $(gdktargetlib)
 GdkX11_3_0_gir_FILES = $(addprefix $(srcdir)/,$(x11_introspection_files))
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 43e14fc..cadc72d 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -926,7 +926,10 @@ introspection_files = \
     gtktypebuiltins.c
 
 Gtk-3.0.gir: $(INTROSPECTION_SCANNER) $(gtktargetlib) $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk
+Gtk_3_0_gir_SCANNERFLAGS = --strip-prefix=Gtk --add-include-path=$(top_builddir)/gdk
+if USE_X11
+Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
+endif
 Gtk_3_0_gir_INCLUDES = Atk-1.0 Gdk-3.0
 Gtk_3_0_gir_CFLAGS = \
 		$(INCLUDES) \