mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-31 11:32:38 +00:00
examples: fix linking order.
the uninstalled wrapper would create a LD_LIBRARY_PATH with system-wide path before the local ones... resulting in the example applications picking up the system-wide libraries and not the (potentially modified) uninstalled libraries
This commit is contained in:
parent
4de2ab48ea
commit
05667813ad
3 changed files with 12 additions and 9 deletions
|
@ -5,8 +5,8 @@ noinst_PROGRAMS = appsrc_ex appsrc-stream appsrc-stream2 appsrc-ra \
|
||||||
appsrc_ex_SOURCES = appsrc_ex.c
|
appsrc_ex_SOURCES = appsrc_ex.c
|
||||||
appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
appsrc_ex_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
appsrc_ex_LDFLAGS = \
|
appsrc_ex_LDFLAGS = \
|
||||||
$(GST_LIBS) \
|
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la
|
$(GST_LIBS)
|
||||||
|
|
||||||
appsrc_stream_SOURCES = appsrc-stream.c
|
appsrc_stream_SOURCES = appsrc-stream.c
|
||||||
appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
appsrc_stream_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
|
@ -27,6 +27,6 @@ appsrc_seekable_LDFLAGS = $(GST_LIBS)
|
||||||
appsink_src_SOURCES = appsink-src.c
|
appsink_src_SOURCES = appsink-src.c
|
||||||
appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
appsink_src_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
appsink_src_LDFLAGS = \
|
appsink_src_LDFLAGS = \
|
||||||
$(GST_LIBS) \
|
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst-libs/gst/app/libgstapp-@GST_MAJORMINOR@.la
|
$(GST_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -6,6 +6,8 @@ examples = $(GTK_EXAMPLES) stepping stepping2
|
||||||
|
|
||||||
noinst_PROGRAMS = $(examples)
|
noinst_PROGRAMS = $(examples)
|
||||||
|
|
||||||
LDADD = $(GST_LIBS) $(GTK_LIBS) \
|
LDADD = \
|
||||||
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
|
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
|
||||||
|
$(GST_LIBS) $(GTK_LIBS)
|
||||||
|
|
||||||
AM_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GTK_CFLAGS) -I$(top_builddir)/gst-libs
|
AM_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GTK_CFLAGS) -I$(top_builddir)/gst-libs
|
||||||
|
|
|
@ -3,7 +3,8 @@ noinst_PROGRAMS = probe
|
||||||
probe_SOURCES = probe.c
|
probe_SOURCES = probe.c
|
||||||
probe_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
|
probe_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
$(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
$(GST_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
probe_LDFLAGS = $(GST_PLUGINS_BASE_LIBS) \
|
probe_LDFLAGS = \
|
||||||
$(GST_BASE_LIBS) $(GST_LIBS) \
|
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la \
|
||||||
$(top_builddir)/gst-libs/gst/interfaces/libgstinterfaces-@GST_MAJORMINOR@.la
|
$(GST_PLUGINS_BASE_LIBS) \
|
||||||
|
$(GST_BASE_LIBS) $(GST_LIBS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue