g-s gir patch

From d6391625c6affe1ff1e4143afbf73277486913d5 Mon Sep 17 00:00:00 2001
From: Tim Lunn <tim@feathertop.org>
Date: Wed, 13 Feb 2013 11:29:49 +1100
Subject: [PATCH] Filter out RequiredDefines include for gir-scanner

---
 src/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 6a6bb24..f7fcadc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -288,7 +288,7 @@ libgnome_shell_la_CPPFLAGS = $(gnome_shell_cflags)

 Shell-0.1.gir: libgnome-shell.la St-1.0.gir
 Shell_0_1_gir_INCLUDES = Clutter-1.0 ClutterX11-1.0 Meta-3.0 TelepathyGLib-0.12 TelepathyLogger-0.2 Soup-2.4 GMenu-3.0 NetworkManager-1.0 NMClient-1.0
-Shell_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
+Shell_0_1_gir_CFLAGS = $(filter-out -include %.h,$(libgnome_shell_la_CPPFLAGS)) -I $(srcdir)
 Shell_0_1_gir_LIBS = libgnome-shell.la
 Shell_0_1_gir_FILES = $(libgnome_shell_la_gir_sources)
 Shell_0_1_gir_SCANNERFLAGS = --include-uninstalled=$(builddir)/St-1.0.gir \
@@ -297,7 +297,7 @@ INTROSPECTION_GIRS += Shell-0.1.gir
 CLEANFILES += Shell-0.1.gir

 ShellJS-0.1.gir: libgnome-shell-js.la
-ShellJS_0_1_gir_CFLAGS = $(libgnome_shell_la_CPPFLAGS) -I $(srcdir)
+ShellJS_0_1_gir_CFLAGS = $(filter-out -include %.h,$(libgnome_shell_la_CPPFLAGS)) -I $(srcdir)
 ShellJS_0_1_gir_LIBS = libgnome-shell-js.la
 ShellJS_0_1_gir_FILES = $(libgnome_shell_js_la_SOURCES)
 INTROSPECTION_GIRS += ShellJS-0.1.gir
@@ -305,7 +305,7 @@ CLEANFILES += ShellJS-0.1.gir

 St-1.0.gir: libst-1.0.la
 St_1_0_gir_INCLUDES = Clutter-1.0 Gtk-3.0
-St_1_0_gir_CFLAGS = $(st_cflags) -DST_COMPILATION
+St_1_0_gir_CFLAGS = $(filter-out -include %.h,$(st_cflags)) -DST_COMPILATION
 St_1_0_gir_LIBS = libst-1.0.la
 St_1_0_gir_FILES = $(filter-out %-private.h $(st_non_gir_sources), $(addprefix $(srcdir)/,$(st_source_h))) \
    $(addprefix $(srcdir)/,$(st_source_c))
--
1.8.1.2