videomixer: fix up Makefile some more

Remove CFLAGS from LIBADD and make order of the various CFLAGS and
LIBS at least consistent with each other.

diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index cf0219c3ab46cae5942f048d4c212a8c4009c4c9..513c88f30c4572a3ed5219c7ff444300144769ff 100644 (file)
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstvideomixer.la
 
 libgstvideomixer_la_SOURCES = videomixer.c blend_ayuv.c blend_bgra.c blend_i420.c blend_rgb.c
 libgstvideomixer_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstvideomixer_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_CFLAGS) -lgstvideo-@GST_MAJORMINOR@
+libgstvideomixer_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@
 libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static