[gst-cvs] gstreamer: tests: more LDFLAGS -> LDADD fixes

Tim Müller tpm at kemper.freedesktop.org
Wed Apr 14 04:10:18 PDT 2010


Module: gstreamer
Branch: master
Commit: 88b4a704f34e896f9ac87c93780f04994f182ffa
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=88b4a704f34e896f9ac87c93780f04994f182ffa

Author: Tim-Philipp Müller <tim.muller at collabora.co.uk>
Date:   Wed Apr 14 11:50:38 2010 +0100

tests: more LDFLAGS -> LDADD fixes

---

 tests/benchmarks/Makefile.am          |    2 +-
 tests/examples/controller/Makefile.am |    5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/benchmarks/Makefile.am b/tests/benchmarks/Makefile.am
index e18c8de..3783da8 100644
--- a/tests/benchmarks/Makefile.am
+++ b/tests/benchmarks/Makefile.am
@@ -12,5 +12,5 @@ LDADD = $(GST_OBJ_LIBS)
 AM_CFLAGS = $(GST_OBJ_CFLAGS)
 
 controller_CFLAGS  = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
-controller_LDFLAGS = $(top_builddir)/libs/gst/controller/libgstcontroller- at GST_MAJORMINOR@.la
+controller_LDADD = $(top_builddir)/libs/gst/controller/libgstcontroller- at GST_MAJORMINOR@.la $(LDADD)
 
diff --git a/tests/examples/controller/Makefile.am b/tests/examples/controller/Makefile.am
index 4ab183e..0255ea7 100644
--- a/tests/examples/controller/Makefile.am
+++ b/tests/examples/controller/Makefile.am
@@ -1,5 +1,6 @@
 noinst_PROGRAMS = audio-example
 
 audio_example_CFLAGS  = $(GST_OBJ_CFLAGS) -I$(top_builddir)/libs
-audio_example_LDADD = $(GST_OBJ_LIBS)
-audio_example_LDFLAGS = $(top_builddir)/libs/gst/controller/libgstcontroller- at GST_MAJORMINOR@.la
+audio_example_LDADD = \
+	$(top_builddir)/libs/gst/controller/libgstcontroller- at GST_MAJORMINOR@.la \
+	$(GST_OBJ_LIBS)





More information about the Gstreamer-commits mailing list