From 48006e2136d05c3d97679045a0748c4c00fd61b2 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 24 Jun 2014 08:01:21 +0200 Subject: [PATCH] compositor: Fix Makefile CFLAGS/LIBADD ordering We want to use the libraries from -bad if/when present --- gst/compositor/Makefile.am | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gst/compositor/Makefile.am b/gst/compositor/Makefile.am index a91f0fa4f2..eee77d3d08 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)