diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2016-11-20 12:40:07 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2016-11-20 13:22:56 +0000 |
| commit | 39b47e54ebc4b16ac9ada76ce7c0e4456f18694c (patch) | |
| tree | 705cca7760e7cd50d72e835b84478679284c3b7e /tests | |
| parent | 2b44392095f346bb209cec14dd97adca85dfe9db (diff) | |
| download | gstreamer-plugins-bad-39b47e54ebc4b16ac9ada76ce7c0e4456f18694c.tar.gz | |
tests: fix lib and cflags order in Makefile.am
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
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/check/Makefile.am | 33 |
1 files changed, 15 insertions, 18 deletions
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 90b216520..25c88fb40 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -329,7 +329,7 @@ elements_audiointerleave_LDADD = $(GST_BASE_LIBS) -lgstbase-@GST_API_VERSION@ $( elements_audiointerleave_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_pnm_CFLAGS = \ - $(GST_PLUGINS_BASE_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AM_CFLAGS) elements_pnm_LDADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstapp-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LDADD) @@ -402,7 +402,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 = \ @@ -480,23 +479,21 @@ elements_dash_isoff_CFLAGS = $(AM_CFLAGS) $(GST_BASE_CFLAGS) elements_dash_isoff_LDADD = $(LDADD) $(GST_BASE_LIBS) elements_dash_isoff_SOURCES = elements/dash_isoff.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) $(GST_PLUGINS_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_neonhttpsrc_CFLAGS = $(AM_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -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) $(GST_PLUGINS_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 @@ -507,7 +504,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 @@ -660,11 +657,11 @@ 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) $(GST_PLUGINS_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) |