summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.com>2016-11-20 12:40:07 +0000
committerTim-Philipp Müller <tim@centricular.com>2016-11-20 13:35:34 +0000
commitfa679eeb01cbdea734464a527f80a4192f655ccb (patch)
treebdc0c92b5072680444a2e8baf21fb04dd25208c7
parent14bb73a1cbf66d2f5b0a22474d2662fbba190b81 (diff)
downloadgstreamer-plugins-bad-1.8.tar.gz
tests: fix lib and cflags order in Makefile.am1.8
pnm: add misssing continuation slash at end of line vp8parser: no need to link codecparsers twice dash_demux, mssdemux, hlsdemux: fix lib/flags ordering - local libs and flags must come first, then base before core before rest Fixes unit test linking error: CCLD elements/dash_demux /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libgsttag-1.0.so: undefined reference to `gst_make_element_message_details' /usr/lib/gcc/x86_64-linux-gnu/6/../../../x86_64-linux-gnu/libgsttag-1.0.so: undefined reference to `gst_element_message_full_with_details'
-rw-r--r--tests/check/Makefile.am32
1 files changed, 15 insertions, 17 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index 3f9ad9d2d..19c138538 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -376,7 +376,6 @@ libs_vp8parser_CFLAGS = \
libs_vp8parser_LDADD = \
$(top_builddir)/gst-libs/gst/codecparsers/libgstcodecparsers-@GST_API_VERSION@.la \
- $(GST_PLUGINS_BAD_LIBS) -lgstcodecparsers-@GST_API_VERSION@ \
$(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
elements_videoframe_audiolevel_CFLAGS = \
@@ -449,21 +448,19 @@ elements_dash_mpd_LDADD = $(LDADD) $(LIBXML2_LIBS) \
$(top_builddir)/gst-libs/gst/uridownloader/libgsturidownloader-@GST_API_VERSION@.la
elements_dash_mpd_SOURCES = elements/dash_mpd.c
-elements_dash_demux_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
+elements_dash_demux_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS) $(LIBXML2_CFLAGS)
elements_dash_demux_LDADD = \
- $(LDADD) $(LIBXML2_LIBS) $(GST_BASE_LIBS) \
- -lgsttag-$(GST_API_VERSION) \
- -lgstapp-$(GST_API_VERSION) \
- $(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@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)
elements_dash_demux_SOURCES = elements/test_http_src.c elements/test_http_src.h elements/adaptive_demux_engine.c elements/adaptive_demux_engine.h elements/adaptive_demux_common.c elements/adaptive_demux_common.h elements/dash_demux.c
-elements_mssdemux_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
+elements_mssdemux_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(AM_CFLAGS) $(LIBXML2_CFLAGS)
elements_mssdemux_LDADD = \
- $(LDADD) $(LIBXML2_LIBS) $(GST_BASE_LIBS) \
- -lgsttag-$(GST_API_VERSION) \
- -lgstapp-$(GST_API_VERSION) \
- $(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@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)
elements_mssdemux_SOURCES = elements/test_http_src.c elements/test_http_src.h elements/adaptive_demux_engine.c elements/adaptive_demux_engine.h elements/adaptive_demux_common.c elements/adaptive_demux_common.h elements/mssdemux.c
@@ -474,7 +471,7 @@ libs_insertbin_LDADD = \
$(top_builddir)/gst-libs/gst/insertbin/libgstinsertbin-@GST_API_VERSION@.la \
$(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(LDADD)
libs_insertbin_CFLAGS = \
- $(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
+ $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS)
libs_player_SOURCES = libs/player.c
@@ -618,11 +615,12 @@ elements_hlsdemux_m3u8_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) -I$(top_srcdir)/
elements_hlsdemux_m3u8_LDADD = $(GST_BASE_LIBS) $(LDADD)
elements_hlsdemux_m3u8_SOURCES = elements/hlsdemux_m3u8.c
-elements_hls_demux_CFLAGS = $(GST_BASE_CFLAGS) $(AM_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS)
-elements_hls_demux_LDADD = $(GST_BASE_LIBS) $(LDADD) \
- -lgsttag-$(GST_API_VERSION) \
- -lgstapp-$(GST_API_VERSION) \
- $(top_builddir)/gst-libs/gst/adaptivedemux/libgstadaptivedemux-@GST_API_VERSION@.la
+elements_hls_demux_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS)
+elements_hls_demux_LDADD = \
+ $(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) $(LDADD)
+
elements_hls_demux_SOURCES = elements/test_http_src.c elements/test_http_src.h elements/adaptive_demux_engine.c elements/adaptive_demux_engine.h elements/adaptive_demux_common.c elements/adaptive_demux_common.h elements/hls_demux.c
orc_compositor_CFLAGS = $(ORC_CFLAGS)