From cc04850bd89680a2a71e9b1174c9b5a21f13e37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Wed, 14 Apr 2010 20:06:09 +0100 Subject: [PATCH] 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 Fixes #615697. --- tests/examples/equalizer/Makefile.am | 2 +- tests/examples/shapewipe/Makefile.am | 4 ++-- tests/examples/spectrum/Makefile.am | 6 +++--- tests/examples/v4l2/Makefile.am | 2 +- tests/icles/Makefile.am | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/examples/equalizer/Makefile.am b/tests/examples/equalizer/Makefile.am index 54c6dc58ea..07f2b253f3 100644 --- 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 0a5eecf1ab..e0e9217dc4 100644 --- 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 a0a71629ac..8bb89da794 100644 --- 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 78e4da12e8..53d6399ff1 100644 --- 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 850522a4c9..f99b7b4427 100644 --- 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