build: Makefile.am fixes

Mostly just add missing $(GST_BASE_CFLAGS), but also fix up order
of flags (see docs/random/moving-plugins).

diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am
index aef35819574bf835fdb985d476781ef5ff4f4086..3b9452f07804e6bb5f58a035b6531b715c000292 100644 (file)
--- a/ext/cdparanoia/Makefile.am
+++ b/ext/cdparanoia/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstcdparanoia.la
 
 libgstcdparanoia_la_SOURCES = gstcdparanoiasrc.c
-libgstcdparanoia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstcdparanoia_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstcdparanoia_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/cdda/libgstcdda-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) \

diff --git a/ext/gio/Makefile.am b/ext/gio/Makefile.am
index 237cfdd2a4bf9c967831b93b99345fa0893dddf0..f4b1611b3761b99309d2f1f67dae7b99aade9f09 100644 (file)
--- a/ext/gio/Makefile.am
+++ b/ext/gio/Makefile.am
@@ -12,7 +12,7 @@ libgstgio_la_SOURCES = \
                gstgiostreamsink.c \
                gstgiostreamsrc.c
 
-libgstgio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
+libgstgio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgstgio_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
 libgstgio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GIO_LDFLAGS)
 libgstgio_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/gnomevfs/Makefile.am b/ext/gnomevfs/Makefile.am
index f87a94b3cd9a8b3c47e631efce3d8572d2df7078..ed18d39d369b595128cb3836e7c7ee2d23fa0eec 100644 (file)
--- a/ext/gnomevfs/Makefile.am
+++ b/ext/gnomevfs/Makefile.am
@@ -7,7 +7,7 @@ libgstgnomevfs_la_SOURCES = \
        gstgnomevfsuri.c
 
 libgstgnomevfs_la_CFLAGS = \
-       $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(GNOME_VFS_CFLAGS)
+       $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GNOME_VFS_CFLAGS)
 libgstgnomevfs_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) $(GNOME_VFS_LIBS)

diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index d5d021364531fe56c99ff82c7410535a48837ad5..839900e574f31788ef8c30e6b862ee6b04455fb9 100644 (file)
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstlibvisual.la
 
 libgstlibvisual_la_SOURCES = visual.c 
-libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS)
+libgstlibvisual_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBVISUAL_CFLAGS)
 libgstlibvisual_la_LIBADD = $(GST_BASE_LIBS) $(LIBVISUAL_LIBS)
 libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstlibvisual_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index 1a7f319a4a6d2f9ce192333c2cf94c82b43486d4..77d48f4aa57377507022f0f28d8532155ea1feb9 100644 (file)
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -17,11 +17,12 @@ libgstogg_la_SOURCES = \
 noinst_HEADERS = \
        gstoggdemux.h gstoggmux.h
 
-libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS) 
+libgstogg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(OGG_CFLAGS)
 libgstogg_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/riff/libgstriff-$(GST_MAJORMINOR).la \
        $(top_builddir)/gst-libs/gst/tag/libgsttag-$(GST_MAJORMINOR).la \
        $(GST_BASE_LIBS) \
+       $(GST_LIBS) \
        $(OGG_LIBS)
 libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstogg_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst-libs/gst/app/Makefile.am b/gst-libs/gst/app/Makefile.am
index 1c5c06460e0a1c69fee42594920484d961e1641d..c58f3253c4633dc6b077ecf49439bdfee8a6786c 100644 (file)
--- a/gst-libs/gst/app/Makefile.am
+++ b/gst-libs/gst/app/Makefile.am
@@ -15,8 +15,8 @@ nodist_libgstapp_@GST_MAJORMINOR@_la_SOURCES = \
              $(built_sources)
 
 libgstapp_@GST_MAJORMINOR@_la_SOURCES = gstappsrc.c gstappbuffer.c gstappsink.c 
-libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
-       $(GST_PLUGINS_BASE_CFLAGS)
+libgstapp_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstapp_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS)
 libgstapp_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 libgstapp_@GST_MAJORMINOR@_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am
index 26f2115c8582442aa78f03e7d2704395552b932b..669d808f427a5505b560cca25c2ed7cc01a087d5 100644 (file)
--- a/gst-libs/gst/audio/Makefile.am
+++ b/gst-libs/gst/audio/Makefile.am
@@ -45,7 +45,7 @@ libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
 nodist_libgstaudio_@GST_MAJORMINOR@include_HEADERS = \
        audio-enumtypes.h
 
-libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstaudio_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstaudio_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \
   $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
 libgstaudio_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)

diff --git a/gst-libs/gst/interfaces/Makefile.am b/gst-libs/gst/interfaces/Makefile.am
index a172bb3d165d41fb078bd4c6b6882aba09ed4dbc..340569d079dfa36e930b13a994d841eb1cb1994e 100644 (file)
--- a/gst-libs/gst/interfaces/Makefile.am
+++ b/gst-libs/gst/interfaces/Makefile.am
@@ -56,7 +56,8 @@ nodist_libgstinterfaces_@GST_MAJORMINOR@_la_SOURCES =         \
        $(built_sources)                                \
        interfaces-marshal.h
 
-libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+# only need base cflags here, xoverlay includes videosink.h for a struct */
+libgstinterfaces_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstinterfaces_@GST_MAJORMINOR@_la_LIBADD = $(GST_LIBS) $(LIBM) 
 libgstinterfaces_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 79d77c34da9f19ef3bef2b54bf3c5a2c33133dc2..9921b2ec052e4a0c31578d930f7e8a8a0a4960de 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -21,7 +21,7 @@ libgstvideo_@GST_MAJORMINOR@include_HEADERS = \
        video.h gstvideosink.h gstvideofilter.h
 nodist_libgstvideo_@GST_MAJORMINOR@include_HEADERS = $(built_headers)
 
-libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstvideo_@GST_MAJORMINOR@_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstvideo_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideo_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 

diff --git a/gst/ffmpegcolorspace/Makefile.am b/gst/ffmpegcolorspace/Makefile.am
index 053b4230ec015e747ec5b29162bc941f6a246b10..f12f8cffe48f106e486ad4499122f6d23fbe4217 100644 (file)
--- a/gst/ffmpegcolorspace/Makefile.am
+++ b/gst/ffmpegcolorspace/Makefile.am
@@ -8,9 +8,9 @@ libgstffmpegcolorspace_la_SOURCES = \
        utils.c \
        imgconvert.c
 
-libgstffmpegcolorspace_la_CFLAGS = $(GST_CFLAGS)
+libgstffmpegcolorspace_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstffmpegcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstffmpegcolorspace_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
+libgstffmpegcolorspace_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstffmpegcolorspace_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = \

diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index 02bc526cd6a1ef41bcd10f6333891c8e23c8817c..c3ed8bdcf1ca2fbcc1cec2af3f20bc2cf856f07b 100644 (file)
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -24,7 +24,7 @@ nodist_libgsttcp_la_SOURCES = \
        $(built_sources)
 
 # remove ENABLE_NEW when dataprotocol is stable
-libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -DGST_ENABLE_NEW
+libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_GDP_CFLAGS) $(GST_CFLAGS) -DGST_ENABLE_NEW
 libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttcp_la_LIBADD = $(GST_BASE_LIBS) $(GST_GDP_LIBS) $(GST_LIBS)
 libgsttcp_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am
index 9403a11ea80b83fbd717ba20a2e41a3dc4c075a6..83b689bcb3fb5b917a9aa98abbb3bc9eb86b63dd 100644 (file)
--- a/gst/videotestsrc/Makefile.am
+++ b/gst/videotestsrc/Makefile.am
@@ -4,9 +4,9 @@ libgstvideotestsrc_la_SOURCES = \
                        gstvideotestsrc.c \
                        videotestsrc.c
 
-libgstvideotestsrc_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS)
+libgstvideotestsrc_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
 libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideotestsrc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBOIL_LIBS)
+libgstvideotestsrc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
 libgstvideotestsrc_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstvideotestsrc.h videotestsrc.h

diff --git a/sys/v4l/Makefile.am b/sys/v4l/Makefile.am
index 688ec963938b3182e963a610bb07fe0b21e4953f..5f2b95fb76f2b76847661026dcdc0d1e4de04649 100644 (file)
--- a/sys/v4l/Makefile.am
+++ b/sys/v4l/Makefile.am
@@ -22,7 +22,7 @@ libgstvideo4linux_la_SOURCES = \
 #      gstv4lmjpegsink.c v4lmjpegsink_calls.c
 
 libgstvideo4linux_la_CFLAGS = \
-       $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) \
+       $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) \
        $(GUDEV_CFLAGS)
 libgstvideo4linux_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la \

diff --git a/tests/examples/app/Makefile.am b/tests/examples/app/Makefile.am
index 7d721b4c783cd31e5bc8260e1e5c3a6852694783..11125be55448e3dc25e5475f71700970f1feed17 100644 (file)
--- a/tests/examples/app/Makefile.am
+++ b/tests/examples/app/Makefile.am
@@ -3,29 +3,29 @@ noinst_PROGRAMS = appsrc_ex appsrc-stream appsrc-stream2 appsrc-ra \
                  appsrc-seekable appsink-src
 
 appsrc_ex_SOURCES = appsrc_ex.c
-appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 appsrc_ex_LDFLAGS = \
-    $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
-    $(GST_LIBS)
+       $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
+       $(GST_BASE_LIBS) $(GST_LIBS)
 
 appsrc_stream_SOURCES = appsrc-stream.c
-appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 appsrc_stream_LDFLAGS = $(GST_LIBS)
 
 appsrc_stream2_SOURCES = appsrc-stream2.c
-appsrc_stream2_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+appsrc_stream2_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 appsrc_stream2_LDFLAGS = $(GST_LIBS)
 
 appsrc_ra_SOURCES = appsrc-ra.c
-appsrc_ra_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+appsrc_ra_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 appsrc_ra_LDFLAGS = $(GST_LIBS)
 
 appsrc_seekable_SOURCES = appsrc-seekable.c
-appsrc_seekable_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+appsrc_seekable_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 appsrc_seekable_LDFLAGS = $(GST_LIBS)
 
 appsink_src_SOURCES = appsink-src.c
-appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 appsink_src_LDFLAGS = \
     $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
     $(GST_LIBS)

diff --git a/tests/examples/overlay/Makefile.am b/tests/examples/overlay/Makefile.am
index 42bd2e2476be86e0b9ae47d5190efd59562bd55d..68576a30c169cb856735f15af04eca323cf5cd9a 100644 (file)
--- a/tests/examples/overlay/Makefile.am
+++ b/tests/examples/overlay/Makefile.am
@@ -6,7 +6,7 @@ if HAVE_GTK_X11
 EXAMPLES += gtk-xoverlay
 
 gtk_xoverlay_SOURCES = gtk-xoverlay.c
-gtk_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
+gtk_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
 gtk_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 endif
@@ -15,7 +15,7 @@ if HAVE_QT
 EXAMPLES += qt-xoverlay
 
 qt_xoverlay_SOURCES = qt-xoverlay.cpp
-qt_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
+qt_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
 qt_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 
@@ -25,7 +25,7 @@ if HAVE_QT_GV
 EXAMPLES += qtgv-xoverlay
 
 qtgv_xoverlay_SOURCES = qtgv-xoverlay.cpp qtgv-xoverlay.h
-qtgv_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
+qtgv_xoverlay_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(X_CFLAGS) $(QT_CFLAGS)
 qtgv_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(QT_LIBS) \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 

diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 6923e6d42f0503244e4be03b18e42572a37de0fb..ce3c6a1a7e5d652c1061f1e48ca94f42fc0299a6 100644 (file)
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -2,7 +2,8 @@ if USE_X
 X_TESTS = stress-xoverlay
 
 stress_xoverlay_SOURCES = stress-xoverlay.c
-stress_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
+stress_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS)
 stress_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 
@@ -10,12 +11,14 @@ if HAVE_GTK_X11
 X_TESTS += test-colorkey test-xoverlay
 
 test_colorkey_SOURCES = test-colorkey.c
-test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
+test_colorkey_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
 test_colorkey_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 
 test_xoverlay_SOURCES = test-xoverlay.c
-test_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
+test_xoverlay_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(X_CFLAGS) $(GTK_CFLAGS)
 test_xoverlay_LDADD = $(GST_LIBS) $(X_LIBS) $(LIBM) $(GTK_LIBS) \
        $(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-$(GST_MAJORMINOR).la
 endif
@@ -36,8 +39,8 @@ PANGO_TESTS =
 endif
 
 audio_trickplay_SOURCES = audio-trickplay.c
-audio_trickplay_CFLAGS  = $(GST_CFLAGS)
-audio_trickplay_LDADD = $(GST_LIBS) -lgstcontroller-$(GST_MAJORMINOR) $(LIBM)
+audio_trickplay_CFLAGS  = $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+audio_trickplay_LDADD = $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBM)
 
 playbin_text_SOURCES = playbin-text.c
 playbin_text_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)