diff options
| author | Edward Hervey <edward@collabora.com> | 2014-06-24 08:01:21 +0200 |
|---|---|---|
| committer | Edward Hervey <edward@collabora.com> | 2014-06-24 08:01:21 +0200 |
| commit | 48006e2136d05c3d97679045a0748c4c00fd61b2 (patch) | |
| tree | 7ef6c9d978c0f5e5e0170cb6ac96607bb8049e5c | |
| parent | f54efc206f0d62d0689d45d9e755224f9416e33d (diff) | |
| download | gstreamer-plugins-bad-48006e2136d05c3d97679045a0748c4c00fd61b2.tar.gz | |
compositor: Fix Makefile CFLAGS/LIBADD ordering
We want to use the libraries from -bad if/when present
| -rw-r--r-- | gst/compositor/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gst/compositor/Makefile.am b/gst/compositor/Makefile.am index a91f0fa4f..eee77d3d0 100644 --- a/gst/compositor/Makefile.am +++ b/gst/compositor/Makefile.am @@ -10,14 +10,16 @@ libgstcompositor_la_SOURCES = \ nodist_libgstcompositor_la_SOURCES = $(ORC_NODIST_SOURCES) -libgstcompositor_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \ +libgstcompositor_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ -I$(top_builddir)/gst-libs \ + $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ORC_CFLAGS) -libgstcompositor_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ - -lgstvideo-@GST_API_VERSION@ \ +libgstcompositor_la_LIBADD = \ $(top_builddir)/gst-libs/gst/base/libgstbadbase-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/video/libgstbadvideo-$(GST_API_VERSION).la \ + $(GST_PLUGINS_BASE_LIBS) \ + -lgstvideo-@GST_API_VERSION@ \ $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM) libgstcompositor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstcompositor_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) |