summaryrefslogtreecommitdiffstats
path: root/gst/videomixer
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-09-22 11:02:02 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-09-22 11:02:02 +0100
commit0506545b04c5b49265969daf731e1c09581ba9d6 (patch)
tree8a889fa36fe79a0501ed20f238009da12b6e6a95 /gst/videomixer
parent341be447a69f18c5c85d6ef2ec79fda2d9ccbd34 (diff)
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.
Diffstat (limited to 'gst/videomixer')
-rw-r--r--gst/videomixer/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index cf0219c3..513c88f3 100644
--- 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