diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2016-06-18 16:35:07 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2016-06-18 16:35:07 +0100 |
| commit | ea555341daf3060b4e1beefa805a020b75ef6ef8 (patch) | |
| tree | 6aa3bbd04ad4a999606e7b2689216789cfb1f3e1 | |
| parent | 9ef169f5e955866006f7a99c9bacf88d4c9041f1 (diff) | |
| download | clutter-gst-ea555341daf3060b4e1beefa805a020b75ef6ef8.tar.gz | |
build: Add dependencies CFLAGS to g-ir-scanner invocation
This is an attempt at fixing the build under Continuous.
| -rw-r--r-- | clutter-gst/Makefile.am | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/clutter-gst/Makefile.am b/clutter-gst/Makefile.am index 45f2cda..63bb37a 100644 --- a/clutter-gst/Makefile.am +++ b/clutter-gst/Makefile.am @@ -65,18 +65,15 @@ libclutter_gst_@CLUTTER_GST_MAJORMINOR@_la_SOURCES = \ $(glib_enum_h) \ $(NULL) -INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir)/clutter-gst/shaders \ - -I$(top_srcdir)/clutter-gst/shaders \ - $(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)/clutter-gst/shaders \ + -I$(top_srcdir)/clutter-gst/shaders \ $(NULL) AM_CFLAGS = \ @@ -140,8 +137,10 @@ 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) \ + $(AM_CPPFLAGS) \ + $(CLUTTER_GST_CFLAGS) \ + $(GST_CFLAGS) \ + $(HW_CFLAGS) \ -D GST_USE_UNSTABLE_API \ --quiet --warn-all \ --add-include-path=$(srcdir) --add-include=path=. \ |