From 142469ab91d7bdd5ee1242a76437fd9899bfaa10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Thu, 27 Apr 2017 21:21:44 +0100 Subject: [PATCH] tests: fix link problem on centos7 And put LIBS before -lgstfoo in adaptivedemux Makefile.am --- gst-libs/gst/adaptivedemux/Makefile.am | 2 +- tests/check/Makefile.am | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gst-libs/gst/adaptivedemux/Makefile.am b/gst-libs/gst/adaptivedemux/Makefile.am index be4baac..74d7c42 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 7e54391..b3ae602 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) -- 2.7.4