build: Makefile.am cleanups

Mostly add $(GST_BASE_CFLAGS) where it was missing, but also fix up
order of flags and libs if needed (see docs/random/moving-plugins).

diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am
index a931fdb6534a34ccb5c27809f87b81a91cae4887..928d475928c24cad063e7334dea3950d8c68c671 100644 (file)
--- a/ext/dv/Makefile.am
+++ b/ext/dv/Makefile.am
@@ -1,10 +1,10 @@
 plugin_LTLIBRARIES = libgstdv.la
 
 libgstdv_la_SOURCES = gstdv.c gstdvdec.c gstdvdemux.c
-libgstdv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBDV_CFLAGS)
+libgstdv_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(LIBDV_CFLAGS)
 libgstdv_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
-        $(GST_BASE_LIBS) $(LIBDV_LIBS)
+        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBDV_LIBS)
 libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdv_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/ext/esd/Makefile.am b/ext/esd/Makefile.am
index e7b864de0f42ff2bde610a32e871529710dde3de..a7a1464b3f8abf1b2f37310cae761e1619e6e5d7 100644 (file)
--- a/ext/esd/Makefile.am
+++ b/ext/esd/Makefile.am
@@ -1,9 +1,11 @@
 plugin_LTLIBRARIES = libgstesd.la
 
 libgstesd_la_SOURCES = esdsink.c gstesd.c
-libgstesd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(ESD_CFLAGS)
+libgstesd_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(ESD_CFLAGS)
 libgstesd_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+       $(GST_BASE_LIBS) \
+       $(GST_LIBS) \
        $(ESD_LIBS)
 libgstesd_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstesd_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am
index e3101789b1ae6960280b5c5c00de1fd3c12e20ae..e44c0488fa3259843178ed5e2d651444e9683be1 100644 (file)
--- a/ext/libcaca/Makefile.am
+++ b/ext/libcaca/Makefile.am
@@ -3,11 +3,12 @@ plugin_LTLIBRARIES = libgstcacasink.la
 libgstcacasink_la_SOURCES = gstcacasink.c
 libgstcacasink_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) \
        $(LIBCACA_CFLAGS)
 libgstcacasink_la_LIBADD = \
-       $(GST_PLUGINS_BASE_LIBS) \
        $(GST_BASE_LIBS) \
+       $(GST_LIBS) \
        $(LIBCACA_LIBS)
 libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstcacasink_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am
index c639b1f7bdfaad0be77a74c50be2ffc3a9f4ef23..9c0d6b7171b83ed4683f1ed28abcbd20e26e8dc6 100644 (file)
--- a/ext/pulse/Makefile.am
+++ b/ext/pulse/Makefile.am
@@ -10,8 +10,9 @@ libgstpulse_la_SOURCES = \
        pulsesrc.c \
        pulseutil.c
 
-libgstpulse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(PULSE_CFLAGS)
-libgstpulse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) $(PULSE_LIBS)
+libgstpulse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
+libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+       -lgstinterfaces-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS)
 libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstpulse_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/ext/shout2/Makefile.am b/ext/shout2/Makefile.am
index df7cc38284fbcb5518061bb2b97cecb20b1b8645..4cb3f7cb9c2cd1f61a08945e85fb146ce331822d 100644 (file)
--- a/ext/shout2/Makefile.am
+++ b/ext/shout2/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstshout2.la
 
 libgstshout2_la_SOURCES = gstshout2.c 
-libgstshout2_la_CFLAGS = $(GST_CFLAGS) $(SHOUT2_CFLAGS)
+libgstshout2_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SHOUT2_CFLAGS)
 libgstshout2_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SHOUT2_LIBS)
 libgstshout2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstshout2_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am
index 80abe5e31c3d9fe1cd7d32a9f0b50f6cf4dad40d..f2efb361469aa0d7dc340903a16728fc6540a9ea 100644 (file)
--- a/ext/speex/Makefile.am
+++ b/ext/speex/Makefile.am
@@ -3,6 +3,7 @@ plugin_LTLIBRARIES = libgstspeex.la
 libgstspeex_la_SOURCES = gstspeex.c gstspeexdec.c gstspeexenc.c
 libgstspeex_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) \
        $(GST_CFLAGS) \
        $(SPEEX_CFLAGS)
 libgstspeex_la_LIBADD = \

diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am
index 8677004108de7fd4fea0ec0a8e94db93b8d22b29..70d24314683786ed02f452b44f77a2a15c86eb45 100644 (file)
--- a/ext/wavpack/Makefile.am
+++ b/ext/wavpack/Makefile.am
@@ -8,8 +8,10 @@ libgstwavpack_la_SOURCES = \
                                gstwavpackenc.c \
                                gstwavpackstreamreader.c
 
-libgstwavpack_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(WAVPACK_CFLAGS)
-libgstwavpack_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(WAVPACK_LIBS)
+libgstwavpack_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+                               $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(WAVPACK_CFLAGS)
+libgstwavpack_la_LIBADD =  $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) \
+                               $(GST_BASE_LIBS) $(GST_LIBS) $(WAVPACK_LIBS)
 libgstwavpack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstwavpack_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/auparse/Makefile.am b/gst/auparse/Makefile.am
index 2862f9fa6049f52c63bebf054d00825893292a7d..08b319346d747a1cfab5242bea8b50c8b24675c4 100644 (file)
--- a/gst/auparse/Makefile.am
+++ b/gst/auparse/Makefile.am
@@ -1,7 +1,7 @@
 plugin_LTLIBRARIES = libgstauparse.la
 
 libgstauparse_la_SOURCES = gstauparse.c
-libgstauparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstauparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstauparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
 libgstauparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstauparse_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am
index dd2af830db80bcfcf0c09e520a111bc0b11e5ba6..37742097f6d2642d8645501a1c091346e8704342 100644 (file)
--- a/gst/avi/Makefile.am
+++ b/gst/avi/Makefile.am
@@ -12,8 +12,7 @@ noinst_HEADERS = \
        gstavidemux.h \
        gstavisubtitle.h
 
-libgstavi_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
-       -I$(top_srcdir)/gst-libs
+libgstavi_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstavi_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
        $(GST_BASE_LIBS) \

diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am
index 7a450493915b88f27a5435c038e345433c4fe524..38ed6818dac343e563dc6202e9c045adf121039a 100644 (file)
--- a/gst/flx/Makefile.am
+++ b/gst/flx/Makefile.am
@@ -1,8 +1,8 @@
 plugin_LTLIBRARIES = libgstflxdec.la
 
 libgstflxdec_la_SOURCES = gstflxdec.c flx_color.c
-libgstflxdec_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) 
-libgstflxdec_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstflxdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstflxdec_la_LIBADD = $(GST_BASE_LIBS)  $(GST_LIBS)
 libgstflxdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstflxdec_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/icydemux/Makefile.am b/gst/icydemux/Makefile.am
index 1905b23c742945eb9bd67b24d4d06d0df398fdf9..167dd628b1988675cd5d7c3c946ee7f1af3333bd 100644 (file)
--- a/gst/icydemux/Makefile.am
+++ b/gst/icydemux/Makefile.am
@@ -1,8 +1,8 @@
 plugin_LTLIBRARIES = libgsticydemux.la
 
 libgsticydemux_la_SOURCES = gsticydemux.c
-libgsticydemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) 
-libgsticydemux_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ $(ZLIB_LIBS)
+libgsticydemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgsticydemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_MAJORMINOR@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
 libgsticydemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsticydemux_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/interleave/Makefile.am b/gst/interleave/Makefile.am
index 8b1df9f587e261e5eecd2278d2d3399dea4b8955..d1d0b82277667edfd61b81fa607e560e021cf488 100644 (file)
--- a/gst/interleave/Makefile.am
+++ b/gst/interleave/Makefile.am
@@ -2,8 +2,8 @@
 plugin_LTLIBRARIES = libgstinterleave.la
 
 libgstinterleave_la_SOURCES = plugin.c interleave.c deinterleave.c
-libgstinterleave_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_LIBS) $(GST_BASE_LIBS)
+libgstinterleave_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_LIBS)
 libgstinterleave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstinterleave_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index f9a6894333671737c613d84d8b4ff8c955301b31..b1e43e213d0018f24e1d5662d6feb8b4ea2e6d22 100644 (file)
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -21,8 +21,7 @@ noinst_HEADERS = \
 libgstmatroska_la_CFLAGS = \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) \
-       $(GST_CFLAGS) \
-       -I$(top_srcdir)/gst-libs
+       $(GST_CFLAGS)
 libgstmatroska_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
        -lgstriff-@GST_MAJORMINOR@ \

diff --git a/gst/qtdemux/Makefile.am b/gst/qtdemux/Makefile.am
index 354667de7f5bf0a7b6e59c6b1a052326b9958754..4d32fc722d7f23058de4ddf65cdcc36c42a0cb3f 100644 (file)
--- a/gst/qtdemux/Makefile.am
+++ b/gst/qtdemux/Makefile.am
@@ -1,14 +1,14 @@
 
 plugin_LTLIBRARIES = libgstqtdemux.la
 
-libgstqtdemux_la_CFLAGS = ${GST_CFLAGS} $(GST_PLUGINS_BASE_CFLAGS) 
+libgstqtdemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstqtdemux_la_LIBADD = \
     $(GST_PLUGINS_BASE_LIBS) \
     -lgstriff-@GST_MAJORMINOR@ \
     -lgstaudio-@GST_MAJORMINOR@ \
     -lgstrtp-@GST_MAJORMINOR@ \
     -lgsttag-@GST_MAJORMINOR@ \
-    $(GST_BASE_LIBS) $(ZLIB_LIBS)
+    $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
 libgstqtdemux_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS} 
 libgstqtdemux_la_SOURCES = quicktime.c gstrtpxqtdepay.c qtdemux.c qtdemux_types.c qtdemux_dump.c
 libgstqtdemux_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/gst/replaygain/Makefile.am b/gst/replaygain/Makefile.am
index 64c07b99568242dd2c4cf7f829621ad537f51b3b..19e45fbcbbed6fb9b6a16546d411c4068848603f 100644 (file)
--- a/gst/replaygain/Makefile.am
+++ b/gst/replaygain/Makefile.am
@@ -7,9 +7,10 @@ libgstreplaygain_la_SOURCES = \
        replaygain.c          \
        rganalysis.c
 libgstreplaygain_la_CFLAGS  = \
-       $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
+       $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstreplaygain_la_LIBADD  = \
-       $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-0.10 $(LIBM)
+       $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-0.10 \
+       $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstreplaygain_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstreplaygain_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index 51796715a8081983c72b0544a2582bd89f18deb7..9292d4fbad6ce54c4766fabab446a025dd629e20 100644 (file)
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -74,12 +74,13 @@ else
 WINSOCK2_LIBS =
 endif
 
-libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
+libgstrtp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                -lgstaudio-@GST_MAJORMINOR@ \
                 -lgsttag-@GST_MAJORMINOR@ \
-                -lgstrtp-@GST_MAJORMINOR@ $(WINSOCK2_LIBS) \
-               $(LIBM)
+                -lgstrtp-@GST_MAJORMINOR@ \
+               $(GST_BASE_LIBS) $(GST_LIBS) \
+               $(WINSOCK2_LIBS) $(LIBM)
 libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 libgstrtp_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am
index d143e436a675ab298d72c603a8984a15ea0313c6..5b521eeb72bacd798f645b9063c67321206dacf8 100644 (file)
--- a/gst/udp/Makefile.am
+++ b/gst/udp/Makefile.am
@@ -17,9 +17,9 @@ libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c gstmultiudpsink.c gstdy
 
 # adding -D_GNU_SOURCE to get non-POSIX extensions like EAI_ADDRFAMILY
 # with glibc >= 2.8 when including netdb.h (see glibc sources bug 6452)
-libgstudp_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -D_GNU_SOURCE
-libgstudp_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) $(WIN32_LIBS)\
-                     -lgstnetbuffer-@GST_MAJORMINOR@
+libgstudp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) -D_GNU_SOURCE
+libgstudp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstnetbuffer-@GST_MAJORMINOR@ \
+                       $(GST_BASE_LIBS) $(WIN32_LIBS)
 libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstudp_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index bef2941eee90e047bb8974b10cd064ede27e10d8..c6d7cb127fad6cdae3d4d7c554d1ebee9d9641d4 100644 (file)
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -1,8 +1,10 @@
 plugin_LTLIBRARIES = libgstvideomixer.la
 
 libgstvideomixer_la_SOURCES = videomixer.c blend.c
-libgstvideomixer_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(LIBOIL_CFLAGS)
-libgstvideomixer_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ $(LIBOIL_LIBS)
+libgstvideomixer_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS) $(LIBOIL_CFLAGS)
+libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ \
+       $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(LIBOIL_LIBS)
 libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am
index 73e36e4243bf69095a09d73f5b7b73db14ac5a8d..cd3e487216053a95cd9f2633591810d5c92a4c83 100644 (file)
--- a/gst/wavparse/Makefile.am
+++ b/gst/wavparse/Makefile.am
@@ -2,16 +2,16 @@ plugin_LTLIBRARIES = libgstwavparse.la
 
 libgstwavparse_la_SOURCES = gstwavparse.c
 libgstwavparse_la_CFLAGS = \
-       $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
-       $(GST_CFLAGS) \
-       -I$(top_srcdir)/gst-libs
+       $(GST_BASE_CFLAGS) \
+       $(GST_CFLAGS)
 libgstwavparse_la_LIBADD = \
+       $(GST_PLUGINS_BASE_LIBS) \
        -lgstriff-@GST_MAJORMINOR@ \
        -lgstaudio-@GST_MAJORMINOR@ \
        -lgsttag-@GST_MAJORMINOR@ \
-       $(GST_PLUGINS_BASE_LIBS) \
        $(GST_BASE_LIBS) \
+       $(GST_LIBS) \
        $(LIBM)
 libgstwavparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstwavparse_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index ab58a9258387b3d9438fabea3c8ff16f41833427..8227905237c15a11f595ca5fcdb0779ee8955974 100644 (file)
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -1,12 +1,18 @@
 plugin_LTLIBRARIES = libgstdirectsoundsink.la\r
 \r
 libgstdirectsoundsink_la_SOURCES =  gstdirectsoundsink.c gstdirectsoundplugin.c\r
-libgstdirectsoundsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \\r
-       $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS)\r
-libgstdirectsoundsink_la_LIBADD = $(DIRECTSOUND_LIBS) \\r
-       $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \\r
-       -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)\r
+libgstdirectsoundsink_la_CFLAGS = \
+       $(GST_PLUGINS_BASE_CFLAGS) \
+       $(GST_BASE_CFLAGS) \
+       $(GST_CFLAGS) \
+       $(DIRECTSOUND_CFLAGS)
+libgstdirectsoundsink_la_LIBADD = \
+       $(GST_PLUGINS_BASE_LIBS) \
+       -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+       $(GST_BASE_LIBS) \
+       $(GST_LIBS) \
+       $(DIRECTSOUND_LIBS)
 libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)\r
 libgstdirectsoundsink_la_LIBTOOLFLAGS = --tag=disable-static\r
 \r
-noinst_HEADERS = gstdirectsoundsink.h\r
+noinst_HEADERS = gstdirectsoundsink.h

diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am
index c6cb212f61f33addf015d1e1b2dbae1a2b829707..c42dfeaa75ba12d49a94fa4acb1db1a6cca451ae 100644 (file)
--- a/sys/oss/Makefile.am
+++ b/sys/oss/Makefile.am
@@ -8,11 +8,12 @@ libgstossaudio_la_SOURCES = gstossaudio.c      \
                            gstosssink.c         \
                            gstosssrc.c
 
-libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstossaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstossaudio_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) \
         -lgstinterfaces-$(GST_MAJORMINOR) \
        -lgstaudio-$(GST_MAJORMINOR) \
+       $(GST_BASE_LIBS) \
        $(GST_LIBS)
 libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
 libgstossaudio_la_LIBTOOLFLAGS = --tag=disable-static

diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am
index c8c084c894100bc50fc4c44c2a917f298c2e2ae1..a9562a818c88e8092fd6468381eea6dd81be4bd0 100644 (file)
--- a/sys/waveform/Makefile.am
+++ b/sys/waveform/Makefile.am
@@ -7,9 +7,12 @@ plugin_LTLIBRARIES = libgstwaveformsink.la
 libgstwaveformsink_la_SOURCES =  gstwaveformsink.c gstwaveformplugin.c
 libgstwaveformsink_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
         $(GST_PLUGINS_BASE_CFLAGS) $(DIRECTSOUND_CFLAGS)
-libgstwaveformsink_la_LIBADD = $(DIRECTSOUND_LIBS) \
-        $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-        -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR)
+libgstwaveformsink_la_LIBADD = \
+       $(GST_PLUGINS_BASE_LIBS) \
+        -lgstaudio-$(GST_MAJORMINOR) -lgstinterfaces-$(GST_MAJORMINOR) \
+        $(GST_BASE_LIBS) \
+       $(GST_LIBS) \
+       $(DIRECTSOUND_LIBS)
 libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)
 libgstwaveformsink_la_LIBTOOLFLAGS = --tag=disable-static
 

diff --git a/tests/examples/v4l2/Makefile.am b/tests/examples/v4l2/Makefile.am
index 43d3da2acc6a35b64d5f32dc5d3de4476a7d0b18..78e4da12e8664cf4984fe02d646c610c191582d2 100644 (file)
--- a/tests/examples/v4l2/Makefile.am
+++ b/tests/examples/v4l2/Makefile.am
@@ -1,6 +1,6 @@
 noinst_PROGRAMS = probe
 
 probe_SOURCES = probe.c
-probe_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
-probe_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10
+probe_CFLAGS  = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+probe_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_BASE_LIBS) $(GST_LIBS)