diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2017-04-27 21:21:44 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2017-04-27 21:33:25 +0100 |
| commit | 142469ab91d7bdd5ee1242a76437fd9899bfaa10 (patch) | |
| tree | ffb57fbdf80f20a0f235482af603225e3e3ee967 | |
| parent | b73339d751b38ea01a9541fe965ed17d932b2aa9 (diff) | |
| download | gstreamer-plugins-bad-142469ab91d7bdd5ee1242a76437fd9899bfaa10.tar.gz | |
tests: fix link problem on centos7
And put LIBS before -lgstfoo in adaptivedemux Makefile.am
| -rw-r--r-- | gst-libs/gst/adaptivedemux/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/gst-libs/gst/adaptivedemux/Makefile.am b/gst-libs/gst/adaptivedemux/Makefile.am index be4baac1b..74d7c4276 100644 --- a/gst-libs/gst/adaptivedemux/Makefile.am +++ b/gst-libs/gst/adaptivedemux/Makefile.am @@ -17,6 +17,6 @@ libgstadaptivedemux_@GST_API_VERSION@_la_CFLAGS = \ $(GST_CFLAGS) libgstadaptivedemux_@GST_API_VERSION@_la_LIBADD = \ $(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-$(GST_API_VERSION).la \ - -lgstapp-$(GST_API_VERSION) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) + $(GST_PLUGINS_BASE_LIBS) -lgstapp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) libgstadaptivedemux_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 7e54391c0..b3ae6020c 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -455,6 +455,7 @@ elements_dash_isoff_SOURCES = elements/dash_isoff.c elements_dash_demux_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS) $(LIBXML2_CFLAGS) elements_dash_demux_LDADD = \ + $(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(LIBXML2_LIBS) $(LDADD) @@ -465,6 +466,7 @@ elements_neonhttpsrc_CFLAGS = $(AM_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) elements_mssdemux_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS) $(LIBXML2_CFLAGS) elements_mssdemux_LDADD = \ + $(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@GST_API_VERSION@.la \ $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) \ $(GST_BASE_LIBS) $(LIBXML2_LIBS) $(LDADD) |