[clutter-gst/clutter-gst-3.0] build: Update the introspection generation

[Emmanuele Bassi <ebassi src gnome org>]

commit 0bb9b3fb90d7eae396f93e75eb543bb364678380
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sat Jun 18 16:41:54 2016 +0100

    build: Update the introspection generation
    
    Include the compiler flags from the dependencies, as well as declare the
    `gst_init()` function before calling it.

 clutter-gst/Makefile.am |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index 0df17b3..3f8f737 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -67,17 +67,14 @@ libclutter_gst_ CLUTTER_GST_MAJORMINOR@_la_SOURCES =        \
        $(glib_enum_h)                                  \
        $(NULL)
 
-INCLUDES =                                     \
-       -I$(top_srcdir)                         \
-       -I$(top_builddir)                       \
-       $(NULL)
-
 AM_CPPFLAGS =                                  \
        -DCLUTTER_GST_COMPILATION               \
        -DG_DISABLE_SINGLE_INCLUDES             \
        -DCOGL_ENABLE_EXPERIMENTAL_API          \
        -DCLUTTER_ENABLE_EXPERIMENTAL_API       \
        -DG_LOG_DOMAIN=\"Clutter-Gst\"          \
+       -I$(top_srcdir)                         \
+       -I$(top_builddir)                       \
        $(NULL)
 
 AM_CFLAGS =                            \
@@ -142,8 +139,11 @@ ClutterGst- CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gs
                GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no DISPLAY="" \
                $(INTROSPECTION_SCANNER) -v \
                --namespace ClutterGst --nsversion= CLUTTER_GST_API_VERSION@ \
-               $(INCLUDES) \
                $(AM_CPPFLAGS) \
+               $(CLUTTER_GST_CFLAGS) \
+               $(GST_CFLAGS) \
+               $(GUDEV_CFLAGS) \
+               $(HW_CFLAGS) \
                -D GST_USE_UNSTABLE_API \
                --quiet --warn-all \
                --add-include-path=$(srcdir) --add-include=path=. \
@@ -162,7 +162,7 @@ ClutterGst- CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gs
                --include=GstAudio-1.0 \
                --add-include-path=`$(PKG_CONFIG) --variable=girdir gstreamer-pbutils-1.0` \
                --include=GstPbutils-1.0 \
-               --add-init-section="gst_init(0, NULL);" \
+               --add-init-section="extern void gst_init (int *argc, char *argv[]); gst_init(0, NULL);" \
                --library=libclutter-gst- CLUTTER_GST_API_VERSION@.la \
                --libtool="${LIBTOOL}" \
                --output $@ \