Commit b5f0b7c2 authored by Tim-Philipp Müller's avatar Tim-Philipp Müller
Browse files

build: use LDADD instead of LDFLAGS to specify libs to link to when building executables

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 initial patch by Brian Cameron <brian.cameron@oracle.com>

Fixes #615697.
parent 555a3a5d
......@@ -27,5 +27,5 @@ noinst_HEADERS = \
#channelmixtest_CFLAGS = $(GST_CFLAGS)
#channelmixtest_LDADD = libgstaudioconvert.la \
# $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la
#channelmixtest_LDFLAGS = $(GST_LIBS)
# $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_MAJORMINOR@.la \
# $(GST_LIBS)
......@@ -4,29 +4,29 @@ noinst_PROGRAMS = appsrc_ex appsrc-stream appsrc-stream2 appsrc-ra \
appsrc_ex_SOURCES = appsrc_ex.c
appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
appsrc_ex_LDFLAGS = \
appsrc_ex_LDADD = \
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
$(GST_BASE_LIBS) $(GST_LIBS)
appsrc_stream_SOURCES = appsrc-stream.c
appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
appsrc_stream_LDFLAGS = $(GST_LIBS)
appsrc_stream_LDADD = $(GST_LIBS)
appsrc_stream2_SOURCES = appsrc-stream2.c
appsrc_stream2_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
appsrc_stream2_LDFLAGS = $(GST_LIBS)
appsrc_stream2_LDADD = $(GST_LIBS)
appsrc_ra_SOURCES = appsrc-ra.c
appsrc_ra_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
appsrc_ra_LDFLAGS = $(GST_LIBS)
appsrc_ra_LDADD = $(GST_LIBS)
appsrc_seekable_SOURCES = appsrc-seekable.c
appsrc_seekable_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
appsrc_seekable_LDFLAGS = $(GST_LIBS)
appsrc_seekable_LDADD = $(GST_LIBS)
appsink_src_SOURCES = appsink-src.c
appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
appsink_src_LDFLAGS = \
appsink_src_LDADD = \
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
$(GST_LIBS)
......@@ -2,20 +2,20 @@ noinst_PROGRAMS = addstream codec-select sprinkle sprinkle2 sprinkle3
addstream_SOURCES = addstream.c
addstream_CFLAGS = $(GST_CFLAGS) -D_GNU_SOURCE
addstream_LDFLAGS = $(GST_LIBS)
addstream_LDADD = $(GST_LIBS)
codec_select_SOURCES = codec-select.c
codec_select_CFLAGS = $(GST_CFLAGS) -D_GNU_SOURCE
codec_select_LDFLAGS = $(GST_LIBS)
codec_select_LDADD = $(GST_LIBS)
sprinkle_SOURCES = sprinkle.c
sprinkle_CFLAGS = $(GST_CFLAGS) -D_GNU_SOURCE
sprinkle_LDFLAGS = $(GST_LIBS)
sprinkle_LDADD = $(GST_LIBS)
sprinkle2_SOURCES = sprinkle2.c
sprinkle2_CFLAGS = $(GST_CFLAGS) -D_GNU_SOURCE
sprinkle2_LDFLAGS = $(GST_LIBS)
sprinkle2_LDADD = $(GST_LIBS)
sprinkle3_SOURCES = sprinkle3.c
sprinkle3_CFLAGS = $(GST_CFLAGS) -D_GNU_SOURCE
sprinkle3_LDFLAGS = $(GST_LIBS)
sprinkle3_LDADD = $(GST_LIBS)
......@@ -2,7 +2,7 @@ if HAVE_GTK
if USE_GIO
noinst_PROGRAMS = giosrc-mounting
giosrc_mounting_SOURCES = giosrc-mounting.c
giosrc_mounting_CFLAGS = $(GTK_CFLAGS) $(GIO_CFLAGS) $(GST_CFLAGS)
giosrc_mounting_LDFLAGS = $(GTK_LIBS) $(GIO_LIBS) $(GST_LIBS)
giosrc_mounting_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GIO_CFLAGS)
giosrc_mounting_LDADD = $(GST_LIBS) $(GTK_LIBS) $(GIO_LIBS)
endif
endif
if HAVE_GTK
noinst_PROGRAMS = volume
volume_SOURCES = volume.c
volume_CFLAGS = $(GTK_CFLAGS) $(GST_CFLAGS) -D_GNU_SOURCE
volume_LDFLAGS = $(GTK_LIBS) $(GST_LIBS) $(LIBM)
volume_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) -D_GNU_SOURCE
volume_LDADD = $(GST_LIBS) $(GTK_LIBS) $(LIBM)
endif
......@@ -3,5 +3,5 @@ noinst_PROGRAMS = switcher
switcher_SOURCES = switcher.c
switcher_CFLAGS = $(GST_CFLAGS)
switcher_LDFLAGS = $(GST_LIBS)
switcher_LDADD = $(GST_LIBS)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment