tests: use LDADD for libs to link to instead of LDFLAGS

Use foo_LDADD instead of foo_LDFLAGS to specify the libraries to link to.
This should make sure arguments are passed to the linker in the right
order, and makes LDFLAGS usable again.

Based on patch by Brian Cameron <brian.cameron@oracle.com>

Fixes #615697.

diff --git a/tests/examples/equalizer/Makefile.am b/tests/examples/equalizer/Makefile.am
index 54c6dc58ea4d4bd6818bb44124a8ea753f1da743..07f2b253f3ae929cd2d4163b0dd12ed2da099b7b 100644 (file)
--- a/tests/examples/equalizer/Makefile.am
+++ b/tests/examples/equalizer/Makefile.am
@@ -4,5 +4,5 @@ endif
 
 demo_SOURCES = demo.c
 demo_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
-demo_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+demo_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
 

diff --git a/tests/examples/shapewipe/Makefile.am b/tests/examples/shapewipe/Makefile.am
index 0a5eecf1ab04153144aa117684c7ae727a81e9b5..e0e9217dc4e5ee9e62f3ecbceeefc6e4c80fa566 100644 (file)
--- a/tests/examples/shapewipe/Makefile.am
+++ b/tests/examples/shapewipe/Makefile.am
@@ -1,8 +1,8 @@
 noinst_PROGRAMS = shapewipe-example
 
 shapewipe_example_SOURCES = shapewipe-example.c
-shapewipe_example_CFLAGS = $(GST_CFLAGS) $(GST_CONTROLLER_CFLAGS)
-shapewipe_example_LDFLAGS = $(GST_LIBS) $(GST_CONTROLLER_LIBS)
+shapewipe_example_CFLAGS = $(GST_CONTROLLER_CFLAGS) $(GST_CFLAGS)
+shapewipe_example_LDADD = $(GST_CONTROLLER_LIBS) $(GST_LIBS)
 
 noinst_HEADERS = 
 

diff --git a/tests/examples/spectrum/Makefile.am b/tests/examples/spectrum/Makefile.am
index a0a71629acaae8c514f939e78ef53f3b7fc71fc2..8bb89da794187d8bb0a1df2d1dea72bcbbfa47ea 100644 (file)
--- a/tests/examples/spectrum/Makefile.am
+++ b/tests/examples/spectrum/Makefile.am
@@ -4,13 +4,13 @@ endif
 
 demo_osssrc_SOURCES = demo-osssrc.c
 demo_osssrc_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
-demo_osssrc_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+demo_osssrc_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
 
 demo_audiotest_SOURCES = demo-audiotest.c
 demo_audiotest_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
-demo_audiotest_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+demo_audiotest_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
 
 spectrum_example_SOURCES = spectrum-example.c
 spectrum_example_CFLAGS  = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS)
-spectrum_example_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
+spectrum_example_LDADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS)
 

diff --git a/tests/examples/v4l2/Makefile.am b/tests/examples/v4l2/Makefile.am
index 78e4da12e8664cf4984fe02d646c610c191582d2..53d6399ff1f7e6dab20d65fe31f998e428b332e5 100644 (file)
--- a/tests/examples/v4l2/Makefile.am
+++ b/tests/examples/v4l2/Makefile.am
@@ -2,5 +2,5 @@ noinst_PROGRAMS = probe
 
 probe_SOURCES = probe.c
 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)
+probe_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstinterfaces-0.10 $(GST_BASE_LIBS) $(GST_LIBS)
 

diff --git a/tests/icles/Makefile.am b/tests/icles/Makefile.am
index 850522a4c965241a218f993b572b6f2c069aefd5..f99b7b44273fbdc3805ebfdc9d5cb0d450c312c1 100644 (file)
--- a/tests/icles/Makefile.am
+++ b/tests/icles/Makefile.am
@@ -1,8 +1,8 @@
 if HAVE_GTK
 GTK_TESTS = gdkpixbufsink-test
 gdkpixbufsink_test_SOURCES = gdkpixbufsink-test.c
-gdkpixbufsink_test_CFLAGS  = $(GTK_CFLAGS) $(GST_CFLAGS)
-gdkpixbufsink_test_LDADD   = $(GTK_LIBS) $(GST_LIBS)
+gdkpixbufsink_test_CFLAGS  = $(GST_CFLAGS) $(GTK_CFLAGS)
+gdkpixbufsink_test_LDADD   = $(GST_LIBS) $(GTK_LIBS)
 gdkpixbufsink_test_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 else
 GTK_TESTS =
@@ -25,7 +25,7 @@ X_TESTS = ximagesrc-test
 
 ximagesrc_test_SOURCES = ximagesrc-test.c
 ximagesrc_test_CFLAGS = $(GST_CFLAGS)
-ximagesrc_test_LDFLAGS = $(GST_LIBS)
+ximagesrc_test_LDADD = $(GST_LIBS)
 else
 X_TESTS =
 endif