Clean up LDFLAGS, LIBS, CFLAGS

Fix order, fix variables that don't exist, like GST_LIBS_LIBS,
use $(LIBM) instead of -lm, and move _LIBS from LDFLAGS to LIBADD.

Spotted by Havard Graff.

6 files changed, 26 insertions, 19 deletions

diff --git a/gst/autoconvert/Makefile.am b/gst/autoconvert/Makefile.am
index 22e8a676b..28fc01557 100644
--- a/gst/autoconvert/Makefile.am
+++ b/gst/autoconvert/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstautoconvert.la
 
 libgstautoconvert_la_SOURCES = gstautoconvert.c gstautoconvert.h
 
-libgstautoconvert_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS)
-libgstautoconvert_la_LIBADD = $(GST_LIBS_LIBS)
-libgstautoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstautoconvert_la_CFLAGS = $(GST_CFLAGS)
+libgstautoconvert_la_LIBADD = $(GST_LIBS)
+libgstautoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstautoconvert_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/dtmf/Makefile.am b/gst/dtmf/Makefile.am
index cbb351c9d..049518ea6 100644
--- a/gst/dtmf/Makefile.am
+++ b/gst/dtmf/Makefile.am
@@ -14,8 +14,10 @@ noinst_HEADERS = gstdtmfsrc.h \
                  gstrtpdtmfcommon.h \
                  tone_detect.h
 
-libgstdtmf_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT
-libgstdtmf_la_LIBADD = $(GST_LIBS_LIBS) -lm
-libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@
+libgstdtmf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
+	-DEXTERN_BUF -DRTP_SUPPORT
+libgstdtmf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
+libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstdtmf_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/liveadder/Makefile.am b/gst/liveadder/Makefile.am
index e27833321..fcc971b6d 100644
--- a/gst/liveadder/Makefile.am
+++ b/gst/liveadder/Makefile.am
@@ -1,9 +1,11 @@
 plugin_LTLIBRARIES = libgstliveadder.la
 
 libgstliveadder_la_SOURCES = liveadder.c
-libgstliveadder_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS)
-libgstliveadder_la_LIBADD = $(GST_LIBS_LIBS)
-libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-0.10
+libgstliveadder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstliveadder_la_LIBADD = \
+	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) $(GST_LIBS)
+libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstliveadder_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = liveadder.h
diff --git a/gst/rtpmux/Makefile.am b/gst/rtpmux/Makefile.am
index 17447ba6b..b77deeb81 100644
--- a/gst/rtpmux/Makefile.am
+++ b/gst/rtpmux/Makefile.am
@@ -2,9 +2,11 @@ plugin_LTLIBRARIES = libgstrtpmux.la
 
 libgstrtpmux_la_SOURCES = gstrtpmuxer.c gstrtpmux.c gstrtpdtmfmux.c
 
-libgstrtpmux_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS) -DEXTERN_BUF -DRTP_SUPPORT
-libgstrtpmux_la_LIBADD = $(GST_LIBS_LIBS)
-libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@
+libgstrtpmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \
+	-DEXTERN_BUF -DRTP_SUPPORT
+libgstrtpmux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) $(GST_LIBS)
+libgstrtpmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstrtpmux_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstrtpmux.h gstrtpdtmfmux.h
diff --git a/gst/siren/Makefile.am b/gst/siren/Makefile.am
index 56b6a3ded..44ed7d8ad 100644
--- a/gst/siren/Makefile.am
+++ b/gst/siren/Makefile.am
@@ -8,9 +8,10 @@ libgstsiren_la_SOURCES = gstsiren.c \
 	encoder.h huffman_consts.h rmlt.c siren7.h
 
 
-libgstsiren_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS)
-libgstsiren_la_LIBADD = $(GST_LIBS_LIBS) $(GST_BASE_LIBS) \
-	-lgstrtp-@GST_MAJORMINOR@ -lm
-libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstsiren_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+	$(GST_CFLAGS)
+libgstsiren_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_MAJORMINOR@ \
+	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
+libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsiren_la_LIBTOOLFLAGS = --tag=disable-static
 
diff --git a/gst/valve/Makefile.am b/gst/valve/Makefile.am
index 09ffadf26..4662a13b5 100644
--- a/gst/valve/Makefile.am
+++ b/gst/valve/Makefile.am
@@ -2,8 +2,8 @@ plugin_LTLIBRARIES = libgstvalve.la
 
 libgstvalve_la_SOURCES = gstvalve.c gstvalve.h
 
-libgstvalve_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(ERROR_CFLAGS)
-libgstvalve_la_LIBADD = $(GST_LIBS_LIBS)
-libgstvalve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS)
+libgstvalve_la_CFLAGS = $(GST_CFLAGS)
+libgstvalve_la_LIBADD = $(GST_LIBS)
+libgstvalve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvalve_la_LIBTOOLFLAGS = --tag=disable-static