projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b73339d)
tests: fix link problem on centos7
authorTim-Philipp Müller <tim@centricular.com>
Thu, 27 Apr 2017 20:21:44 +0000 (21:21 +0100)
committerTim-Philipp Müller <tim@centricular.com>
Thu, 27 Apr 2017 20:33:25 +0000 (21:33 +0100)
And put LIBS before -lgstfoo in adaptivedemux Makefile.am

gst-libs/gst/adaptivedemux/Makefile.am patch | blob | history
tests/check/Makefile.am patch | blob | history

diff --git a/gst-libs/gst/adaptivedemux/Makefile.am b/gst-libs/gst/adaptivedemux/Makefile.am
index be4baac..74d7c42 100644 (file)
--- 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 7e54391..b3ae602 100644 (file)
--- 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)
Domain: Multimedia / Media Common;