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 dcaeb148f5e9837747b4b73db80f536d7b01ffeb..8cba98d585ab24819c3a41138e8a173a61969daa 100644 (file)
--- 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 78957d30dadf9b867267d677d7b5bce459cb0249..98f4cbc8e595c3500a9573c8c04de05e055d3789 100644 (file)
--- 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