[clutter-gst/clutter-gst-2.0] build: Attempt at replicating introspection's build rules

[Emmanuele Bassi <ebassi src gnome org>]

commit 294ba933429672b0be32d84b5331a7ecac98340e
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Sun Jun 19 11:18:46 2016 +0100

    build: Attempt at replicating introspection's build rules
    
    Since Clutter-GStreamer does not use Makefile.introspection to generate
    the GIR and typelib files, we need to try and keep the build rules as
    close as possible, in the hope that the reason why Continuous breaks
    whenever generating the introspection data for GStreamer and
    GStreamer-based libraries lies in how the build rules for generating
    introspection data are defined.

 clutter-gst/Makefile.am |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am
index b09eb40..381365d 100644
--- a/clutter-gst/Makefile.am
+++ b/clutter-gst/Makefile.am
@@ -135,13 +135,9 @@ BUILT_GIRSOURCES =
 ClutterGst- CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gst- 
CLUTTER_GST_API_VERSION@.la
        $(QUIET_GEN) \
                GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no DISPLAY="" \
+               CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" 
PKG_CONFIG="$(PKG_CONFIG)" DLLTOOL="$(DLLTOOL)" \
                $(INTROSPECTION_SCANNER) -v \
                --namespace ClutterGst --nsversion= CLUTTER_GST_API_VERSION@ \
-               $(AM_CPPFLAGS) \ 
-               $(CLUTTER_GST_CFLAGS) \
-               $(GST_CFLAGS) \
-               $(HW_CFLAGS) \
-               -D GST_USE_UNSTABLE_API \
                --quiet --warn-all \
                --add-include-path=$(srcdir) --add-include=path=. \
                --c-include="clutter-gst/clutter-gst.h" \
@@ -164,6 +160,13 @@ ClutterGst- CLUTTER_GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libclutter-gs
                --pkg gstreamer-1.0 \
                --pkg gstreamer-base-1.0 \
                --pkg-export clutter-gst- CLUTTER_GST_API_VERSION@ \
+               --cflags-begin \
+               $(AM_CPPFLAGS) \
+               $(CLUTTER_GST_CFLAGS) \
+               $(GST_CFLAGS) \
+               $(HW_CFLAGS) \
+               -DGST_USE_UNSTABLE_API \
+               --cflags-end \
                $(cluttergstheaders_HEADERS) \
                $(addprefix $(srcdir)/, $(source_c))