From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 14 Jan 2011 14:44:10 +0000 (-0500)
Subject: Add --include-uninstalled for the gdk gir
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=9d14edf760153a9ea38f8e7dd3af995be06f4bfb;p=~andy%2Fgtk

Add --include-uninstalled for the gdk gir

https://bugzilla.gnome.org/show_bug.cgi?id=635287
---

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index dcaeb148f..8cba98d58 100644
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -185,7 +185,8 @@ introspection_files = 		\
         gdkenumtypes.h
 
 Gdk-3.0.gir: libgdk-3.0.la Makefile
-Gdk_3_0_gir_SCANNERFLAGS = --warn-all --c-include="gdk/gdk.h"
+Gdk_3_0_gir_SCANNERFLAGS = 	\
+	--c-include="gdk/gdk.h"
 Gdk_3_0_gir_INCLUDES = Gio-2.0 GdkPixbuf-2.0 Pango-1.0 cairo-1.0
 Gdk_3_0_gir_LIBS = libgdk-3.0.la
 Gdk_3_0_gir_FILES = $(introspection_files)
@@ -234,7 +235,10 @@ x11_introspection_files = 		\
 	x11/gdkx11window.h
 
 GdkX11-3.0.gir: libgdk-3.0.la Gdk-3.0.gir Makefile
-GdkX11_3_0_gir_SCANNERFLAGS = --warn-all --strip-prefix=Gdk --c-include="gdk/gdkx.h"
+GdkX11_3_0_gir_SCANNERFLAGS = 		\
+	--strip-prefix=Gdk		\
+	--c-include="gdk/gdkx.h"	\
+	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
 GdkX11_3_0_gir_INCLUDES = Gio-2.0 Gdk-3.0 GdkPixbuf-2.0 Pango-1.0 xlib-2.0
 GdkX11_3_0_gir_LIBS = libgdk-3.0.la
 GdkX11_3_0_gir_FILES = $(x11_introspection_files)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 78957d30d..98f4cbc8e 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -969,7 +969,9 @@ introspection_files = \
     gtktypebuiltins.c
 
 Gtk-3.0.gir: $(INTROSPECTION_SCANNER) libgtk-3.0.la $(top_builddir)/gdk/Gdk-3.0.gir Makefile
-Gtk_3_0_gir_SCANNERFLAGS = --warn-all --add-include-path=$(top_builddir)/gdk
+Gtk_3_0_gir_SCANNERFLAGS = 			\
+	--add-include-path=$(top_builddir)/gdk	\
+	--include-uninstalled=$(top_builddir)/gdk/Gdk-3.0.gir
 if USE_X11
 Gtk_3_0_gir_SCANNERFLAGS += --add-include-path=$(top_builddir)/gdk/x11
 endif