diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-03 00:50:33 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-02-03 00:50:33 +0000 |
| commit | f8f462045184086e610079c872b80e745b7d8474 (patch) | |
| tree | 14d3ec94e02541610ff3fe2d7cb868bb7f55816d /gst | |
| parent | 0d1c9624ea568456c23845c0673bf7bee8ebace3 (diff) | |
| download | gstreamer-plugins-bad-f8f462045184086e610079c872b80e745b7d8474.tar.gz | |
build: fix CFLAGS order and LIBS order
_BAD_CFLAGS should always come first, then GST_PLUGINS_BASE_CFLAGS,
then GST_BASE_CFLAGS then GST_CFLAGS. Same for libs: first plugins
base libs, then GST_BASE_LIB then GST_LIBS.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/hls/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/inter/Makefile.am | 16 | ||||
| -rw-r--r-- | gst/liveadder/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/mve/Makefile.am | 2 |
4 files changed, 12 insertions, 12 deletions
diff --git a/gst/hls/Makefile.am b/gst/hls/Makefile.am index 19fd6211f..fec8eeb27 100644 --- a/gst/hls/Makefile.am +++ b/gst/hls/Makefile.am @@ -6,8 +6,8 @@ libgstfragmented_la_SOURCES = \ gsthlsdemux.c \ gstfragmentedplugin.c -libgstfragmented_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(SOUP_CFLAGS) -libgstfragmented_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(SOUP_LIBS) +libgstfragmented_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUP_CFLAGS) +libgstfragmented_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SOUP_LIBS) libgstfragmented_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -no-undefined libgstfragmented_la_LIBTOOLFLAGS = --tag=disable-static diff --git a/gst/inter/Makefile.am b/gst/inter/Makefile.am index d6749a5ef..e40495987 100644 --- a/gst/inter/Makefile.am +++ b/gst/inter/Makefile.am @@ -22,15 +22,15 @@ noinst_HEADERS = \ gstintersurface.h libgstinter_la_CFLAGS = \ - $(GST_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BAD_CFLAGS) \ - $(GST_BASE_CFLAGS) + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_CFLAGS) libgstinter_la_LIBADD = \ - $(GST_LIBS) \ - $(GST_BASE_LIBS) \ $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstaudio-@GST_MAJORMINOR@ \ + $(GST_BASE_LIBS) \ + $(GST_LIBS) \ $(LIBM) libgstinter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) @@ -40,13 +40,13 @@ gstintertest_SOURCES = \ gstintertest.c gstintertest_CFLAGS = \ - $(GST_CFLAGS) \ + $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ - $(GST_PLUGINS_BAD_CFLAGS) + $(GST_CFLAGS) gstintertest_LDADD = \ - $(GST_LIBS) \ $(GST_PLUGINS_BASE_LIBS) \ + $(GST_LIBS) \ $(LIBM) Android.mk: Makefile.am $(BUILT_SOURCES) diff --git a/gst/liveadder/Makefile.am b/gst/liveadder/Makefile.am index 14f490da7..0bbeff90f 100644 --- a/gst/liveadder/Makefile.am +++ b/gst/liveadder/Makefile.am @@ -1,7 +1,7 @@ plugin_LTLIBRARIES = libgstliveadder.la libgstliveadder_la_SOURCES = liveadder.c -libgstliveadder_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) +libgstliveadder_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) libgstliveadder_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS) diff --git a/gst/mve/Makefile.am b/gst/mve/Makefile.am index 2c3104f64..8be4517d3 100644 --- a/gst/mve/Makefile.am +++ b/gst/mve/Makefile.am @@ -1,6 +1,6 @@ plugin_LTLIBRARIES = libgstmve.la -libgstmve_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS) +libgstmve_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) libgstmve_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) libgstmve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmve_la_LIBTOOLFLAGS = --tag=disable-static |