[introspection] Add --c-include to g-ir-scanner

Since Clutter has a single-include header policy we need to put
the header to be included inside the GIR file.

diff --git a/clutter/Makefile.am b/clutter/Makefile.am
index 9543f1e..cb79c7f 100644 (file)
--- a/clutter/Makefile.am
+++ b/clutter/Makefile.am
@@ -249,24 +249,26 @@ endif
 # subdir Makefile.am, so just extract them from cogl.h instead. The doc
 # comments for COGL are in the headers, so we don't need the source files.
 Clutter-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@.la
-       $(INTROSPECTION_SCANNER) -v --namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \
-            $(INCLUDES) \
-            --add-include-path=cogl \
-            $(json_gir_include_path) \
-             --include=GL-1.0 \
-             --include=GObject-2.0 \
-             --include=Pango-1.0 \
-             --include=PangoCairo-1.0 \
-            --include=Cogl-@CLUTTER_API_VERSION@ \
-             --include=ClutterJson-@CLUTTER_API_VERSION@ \
-            --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
-            --libtool="$(top_builddir)/doltlibtool" \
-             --pkg gobject-2.0 \
-             --pkg pango \
-             --pkg pangocairo \
-             --output $@ \
-            $(clutter_HEADERS) \
-            $(source_c)
+       $(INTROSPECTION_SCANNER) -v \
+               --namespace Clutter --nsversion=@CLUTTER_API_VERSION@ \
+               $(INCLUDES) \
+               --add-include-path=cogl \
+               $(json_gir_include_path) \
+               --c-include='clutter/clutter.h' \
+               --include=GL-1.0 \
+               --include=GObject-2.0 \
+               --include=Pango-1.0 \
+               --include=PangoCairo-1.0 \
+               --include=Cogl-@CLUTTER_API_VERSION@ \
+               --include=ClutterJson-@CLUTTER_API_VERSION@ \
+               --library=clutter-@CLUTTER_FLAVOUR@-@CLUTTER_API_VERSION@ \
+               --libtool="$(top_builddir)/doltlibtool" \
+               --pkg gobject-2.0 \
+               --pkg pango \
+               --pkg pangocairo \
+               --output $@ \
+               $(clutter_HEADERS) \
+               $(source_c)
 
 BUILT_GIRSOURCES += Clutter-@CLUTTER_API_VERSION@.gir
 

diff --git a/clutter/cogl/Makefile.am b/clutter/cogl/Makefile.am
index cae7987..c9dce0e 100644 (file)
--- a/clutter/cogl/Makefile.am
+++ b/clutter/cogl/Makefile.am
@@ -72,6 +72,7 @@ Cogl-@CLUTTER_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-cogl.la
                -I$(top_srcdir)/clutter/cogl/@CLUTTER_COGL@ \
                -I$(top_builddir)/clutter \
                -DCLUTTER_COMPILATION \
+               --c-include='cogl/cogl.h' \
                --include=GL-1.0 \
                --include=GObject-2.0 \
                --library=clutter-cogl \