mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-17 03:35:21 +00:00
build: when building executables, put libs to link to into LDADD 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. See #615697.
This commit is contained in:
parent
246f5dba96
commit
47ac7cf1fc
2 changed files with 6 additions and 6 deletions
|
@ -3,7 +3,7 @@ helpersdir=$(libexecdir)/gstreamer-$(GST_MAJORMINOR)
|
|||
|
||||
gst_plugin_scanner_SOURCES = gst-plugin-scanner.c
|
||||
gst_plugin_scanner_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||
gst_plugin_scanner_LDFLAGS = $(GST_OBJ_LIBS)
|
||||
gst_plugin_scanner_LDADD = $(GST_OBJ_LIBS)
|
||||
|
||||
# clean out the old one to make sure everything is udpated correctly
|
||||
# remove again after release
|
||||
|
|
|
@ -39,24 +39,24 @@ bin_SCRIPTS = gst-feedback-@GST_MAJORMINOR@
|
|||
if !GST_DISABLE_LOADSAVE
|
||||
gst_xmllaunch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
|
||||
gst_xmllaunch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||
gst_xmllaunch_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
|
||||
gst_xmllaunch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
|
||||
endif
|
||||
|
||||
if !GST_DISABLE_PARSE
|
||||
gst_launch_@GST_MAJORMINOR@_SOURCES = gst-launch.c tools.h
|
||||
gst_launch_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||
gst_launch_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
|
||||
gst_launch_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
|
||||
endif
|
||||
|
||||
gst_inspect_@GST_MAJORMINOR@_SOURCES = gst-inspect.c tools.h
|
||||
gst_inspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||
gst_inspect_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
|
||||
gst_inspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
|
||||
gst_typefind_@GST_MAJORMINOR@_SOURCES = gst-typefind.c tools.h
|
||||
gst_typefind_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||
gst_typefind_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
|
||||
gst_typefind_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
|
||||
gst_xmlinspect_@GST_MAJORMINOR@_SOURCES = gst-xmlinspect.c tools.h
|
||||
gst_xmlinspect_@GST_MAJORMINOR@_CFLAGS = $(GST_OBJ_CFLAGS)
|
||||
gst_xmlinspect_@GST_MAJORMINOR@_LDFLAGS = $(GST_OBJ_LIBS)
|
||||
gst_xmlinspect_@GST_MAJORMINOR@_LDADD = $(GST_OBJ_LIBS)
|
||||
|
||||
gst-feedback-@GST_MAJORMINOR@: gst-feedback-m.m
|
||||
$(AM_V_GEN)cp $(srcdir)/gst-feedback-m.m $@ && \
|
||||
|
|
Loading…
Reference in a new issue