diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2016-06-19 11:33:02 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2016-06-19 11:33:02 +0100 |
| commit | 0a3fc6224556f0bb6fbf7ce1f74b163b113771c5 (patch) | |
| tree | 3a9fa2092092288edf31aa20e18cf4b21e9a5849 | |
| parent | 0bb9b3fb90d7eae396f93e75eb543bb364678380 (diff) | |
| download | clutter-gst-0a3fc6224556f0bb6fbf7ce1f74b163b113771c5.tar.gz | |
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.
| -rw-r--r-- | clutter-gst/Makefile.am | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 3f8f737..ef501c1 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -137,14 +137,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) \ - $(GUDEV_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" \ @@ -173,6 +168,14 @@ 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) \ + $(GUDEV_CFLAGS) \ + $(HW_CFLAGS) \ + -DGST_USE_UNSTABLE_API \ + --cflags-end \ $(cluttergstheaders_HEADERS) \ $(source_c) |