gst: Add better support for static plugins

diff --git a/configure.ac b/configure.ac
index 92a1a8e..7056611 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -265,6 +265,28 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
   ["${srcdir}/gst-plugins-good.doap"],
   [$PACKAGE_VERSION_MAJOR.$PACKAGE_VERSION_MINOR.$PACKAGE_VERSION_MICRO])
 
+dnl build static plugins or not
+AC_MSG_CHECKING([whether to build static plugins or not])
+AC_ARG_ENABLE(
+  static-plugins,
+  AC_HELP_STRING(
+    [--enable-static-plugins],
+    [build static plugins @<:@default=no@:>@]),
+  [AS_CASE(
+    [$enableval], [no], [], [yes], [],
+    [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])],
+  [enable_static_plugins=no])
+AC_MSG_RESULT([$enable_static_plugins])
+if test "x$enable_static_plugins" = xyes; then
+  AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1,
+    [Define if static plugins should be built])
+  GST_PLUGIN_LIBTOOLFLAGS=""
+else
+  GST_PLUGIN_LIBTOOLFLAGS="--tag=disable-static"
+fi
+AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS)
+AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes")
+
 # set by AG_GST_PARSE_SUBSYSTEM_DISABLES above
 dnl make sure it doesn't complain about unused variables if debugging is disabled
 NO_WARNINGS=""
@@ -1071,7 +1093,7 @@ AC_SUBST(GST_ALL_LDFLAGS)
 
 dnl this really should only contain flags, not libs - they get added before
 dnl whatevertarget_LIBS and -L flags here affect the rest of the linking
-GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_desc.*' $GST_ALL_LDFLAGS"
+GST_PLUGIN_LDFLAGS="-module -avoid-version -export-symbols-regex '^[_]*gst_plugin_.*' $GST_ALL_LDFLAGS"
 AC_SUBST(GST_PLUGIN_LDFLAGS)
 
 dnl *** output files ***

diff --git a/ext/aalib/Makefile.am b/ext/aalib/Makefile.am
index c106242..b649e73 100644 (file)
--- a/ext/aalib/Makefile.am
+++ b/ext/aalib/Makefile.am
@@ -4,6 +4,6 @@ libgstaasink_la_SOURCES = gstaasink.c
 libgstaasink_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(AALIB_CFLAGS)
 libgstaasink_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(AALIB_LIBS)
 libgstaasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaasink_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaasink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstaasink.h

diff --git a/ext/cairo/Makefile.am b/ext/cairo/Makefile.am
index fac51f6..0e0b57b 100644 (file)
--- a/ext/cairo/Makefile.am
+++ b/ext/cairo/Makefile.am
@@ -13,5 +13,5 @@ libgstcairo_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(CAIRO_LIBS) $(LIBM)
 libgstcairo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcairo_la_LIBTOOLFLAGS = --tag=disable-static
+libgstcairo_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 

diff --git a/ext/dv/Makefile.am b/ext/dv/Makefile.am
index aa2ae23..113f33b 100644 (file)
--- a/ext/dv/Makefile.am
+++ b/ext/dv/Makefile.am
@@ -6,7 +6,7 @@ libgstdv_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBDV_LIBS)
 libgstdv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdv_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdv_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdvdemux.h gstdvdec.h gstsmptetimecode.h
 

diff --git a/ext/flac/Makefile.am b/ext/flac/Makefile.am
index ba91533..ed1ce10 100644 (file)
--- a/ext/flac/Makefile.am
+++ b/ext/flac/Makefile.am
@@ -8,6 +8,6 @@ libgstflac_la_LIBADD = \
        -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(FLAC_LIBS)
 libgstflac_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstflac_la_LIBTOOLFLAGS = --tag=disable-static
+libgstflac_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstflacenc.h gstflacdec.h gstflactag.h

diff --git a/ext/gdk_pixbuf/Makefile.am b/ext/gdk_pixbuf/Makefile.am
index ed6cec6..d8f407f 100644 (file)
--- a/ext/gdk_pixbuf/Makefile.am
+++ b/ext/gdk_pixbuf/Makefile.am
@@ -21,7 +21,7 @@ libgstgdkpixbuf_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) $(GDK_PIXBUF_LIBS)
 libgstgdkpixbuf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgdkpixbuf_la_LIBTOOLFLAGS = --tag=disable-static
+libgstgdkpixbuf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstgdkpixbufdec.h \

diff --git a/ext/jack/Makefile.am b/ext/jack/Makefile.am
index b9ff9f6..e786a8d 100644 (file)
--- a/ext/jack/Makefile.am
+++ b/ext/jack/Makefile.am
@@ -5,6 +5,6 @@ libgstjack_la_SOURCES = gstjackutil.c gstjack.c gstjackaudiosrc.c gstjackaudiosi
 libgstjack_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(JACK_CFLAGS)
 libgstjack_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(JACK_LIBS)
 libgstjack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstjack_la_LIBTOOLFLAGS = --tag=disable-static
+libgstjack_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstjackutil.h gstjackaudiosrc.h gstjackaudiosink.h gstjackaudioclient.h gstjack.h gstjackringbuffer.h

diff --git a/ext/jpeg/Makefile.am b/ext/jpeg/Makefile.am
index 2f30617..f394efb 100644 (file)
--- a/ext/jpeg/Makefile.am
+++ b/ext/jpeg/Makefile.am
@@ -10,7 +10,7 @@ libgstjpeg_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAG
 libgstjpeg_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(JPEG_LIBS) $(LIBM)
 libgstjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstjpeg_la_LIBTOOLFLAGS = --tag=disable-static
+libgstjpeg_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstjpeg.h \

diff --git a/ext/libcaca/Makefile.am b/ext/libcaca/Makefile.am
index 2c0bd60..029f529 100644 (file)
--- a/ext/libcaca/Makefile.am
+++ b/ext/libcaca/Makefile.am
@@ -13,6 +13,6 @@ libgstcacasink_la_LIBADD = \
        $(GST_LIBS) \
        $(LIBCACA_LIBS)
 libgstcacasink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcacasink_la_LIBTOOLFLAGS = --tag=disable-static
+libgstcacasink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstcacasink.h

diff --git a/ext/libpng/Makefile.am b/ext/libpng/Makefile.am
index a214160..7f80d86 100644 (file)
--- a/ext/libpng/Makefile.am
+++ b/ext/libpng/Makefile.am
@@ -5,6 +5,6 @@ libgstpng_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(LIBPNG_CFLAGS)
 libgstpng_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
        $(GST_LIBS) $(LIBPNG_LIBS)
 libgstpng_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpng_la_LIBTOOLFLAGS = --tag=disable-static
+libgstpng_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstpngdec.h gstpngenc.h

diff --git a/ext/mikmod/Makefile.am b/ext/mikmod/Makefile.am
index f71b2b6..41c3c55 100644 (file)
--- a/ext/mikmod/Makefile.am
+++ b/ext/mikmod/Makefile.am
@@ -4,7 +4,7 @@ libgstmikmod_la_SOURCES = gstmikmod.c drv_gst.c mikmod_reader.c
 libgstmikmod_la_CFLAGS = $(GST_CFLAGS) $(MIKMOD_CFLAGS)
 libgstmikmod_la_LIBADD = $(GST_LIBS) $(MIKMOD_LIBS)
 libgstmikmod_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmikmod_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmikmod_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstmikmod.h 
 

diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am
index 5aa6db0..04de951 100644 (file)
--- a/ext/pulse/Makefile.am
+++ b/ext/pulse/Makefile.am
@@ -12,7 +12,7 @@ libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        -lgstpbutils-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS)
 libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpulse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstpulse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        pulseprobe.h \

diff --git a/ext/raw1394/Makefile.am b/ext/raw1394/Makefile.am
index 03f448b..4df412a 100644 (file)
--- a/ext/raw1394/Makefile.am
+++ b/ext/raw1394/Makefile.am
@@ -22,7 +22,7 @@ libgst1394_la_LIBADD = \
        $(GST_LIBS) \
        $(DV1394_LIBS)
 libgst1394_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgst1394_la_LIBTOOLFLAGS = --tag=disable-static
+libgst1394_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdv1394src.h gst1394probe.h $(hdvheaders) \
        gst1394clock.h

diff --git a/ext/shout2/Makefile.am b/ext/shout2/Makefile.am
index 4cb3f7c..45e12c9 100644 (file)
--- a/ext/shout2/Makefile.am
+++ b/ext/shout2/Makefile.am
@@ -4,6 +4,6 @@ libgstshout2_la_SOURCES = gstshout2.c
 libgstshout2_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SHOUT2_CFLAGS)
 libgstshout2_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(SHOUT2_LIBS)
 libgstshout2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstshout2_la_LIBTOOLFLAGS = --tag=disable-static
+libgstshout2_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstshout2.h

diff --git a/ext/soup/Makefile.am b/ext/soup/Makefile.am
index 5b6756d..e34fe87 100644 (file)
--- a/ext/soup/Makefile.am
+++ b/ext/soup/Makefile.am
@@ -8,6 +8,6 @@ libgstsouphttpsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
        -DSOUP_VERSION_MAX_ALLOWED=SOUP_DEPRECATED_IN_2_26
 libgstsouphttpsrc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(SOUP_LIBS)
 libgstsouphttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsouphttpsrc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsouphttpsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsouphttpsrc.h gstsouphttpclientsink.h

diff --git a/ext/speex/Makefile.am b/ext/speex/Makefile.am
index 878e3e9..a6c8c4a 100644 (file)
--- a/ext/speex/Makefile.am
+++ b/ext/speex/Makefile.am
@@ -13,6 +13,6 @@ libgstspeex_la_LIBADD = \
        $(GST_LIBS) \
        $(SPEEX_LIBS)
 libgstspeex_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
-libgstspeex_la_LIBTOOLFLAGS = --tag=disable-static
+libgstspeex_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstspeexenc.h gstspeexdec.h 

diff --git a/ext/taglib/Makefile.am b/ext/taglib/Makefile.am
index b268808..d959c0a 100644 (file)
--- a/ext/taglib/Makefile.am
+++ b/ext/taglib/Makefile.am
@@ -14,6 +14,6 @@ libgsttaglib_la_LIBADD = \
        $(GST_LIBS) \
        $(TAGLIB_LIBS)
 libgsttaglib_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttaglib_la_LIBTOOLFLAGS = --tag=disable-static
+libgsttaglib_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstid3v2mux.h gstapev2mux.h

diff --git a/ext/vpx/Makefile.am b/ext/vpx/Makefile.am
index f54ce1d..10b0b35 100644 (file)
--- a/ext/vpx/Makefile.am
+++ b/ext/vpx/Makefile.am
@@ -17,7 +17,7 @@ libgstvpx_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ -lgstvideo-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(VPX_LIBS)
 libgstvpx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvpx_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvpx_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstvp8dec.h \

diff --git a/ext/wavpack/Makefile.am b/ext/wavpack/Makefile.am
index acde3fb..83163fc 100644 (file)
--- a/ext/wavpack/Makefile.am
+++ b/ext/wavpack/Makefile.am
@@ -12,7 +12,7 @@ libgstwavpack_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 libgstwavpack_la_LIBADD =  $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
                                $(GST_BASE_LIBS) $(GST_LIBS) $(WAVPACK_LIBS)
 libgstwavpack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstwavpack_la_LIBTOOLFLAGS = --tag=disable-static
+libgstwavpack_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
                gstwavpackdec.h \

diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am
index 5aac7bb..ee6495e 100644 (file)
--- a/gst/alpha/Makefile.am
+++ b/gst/alpha/Makefile.am
@@ -6,7 +6,7 @@ libgstalpha_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 libgstalpha_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstalpha_la_LIBTOOLFLAGS = --tag=disable-static
+libgstalpha_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 libgstalphacolor_la_SOURCES = gstalphacolor.c
 libgstalphacolor_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
@@ -14,7 +14,7 @@ libgstalphacolor_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 libgstalphacolor_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstalphacolor_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstalphacolor_la_LIBTOOLFLAGS = --tag=disable-static
+libgstalphacolor_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstalpha.h gstalphacolor.h
 

diff --git a/gst/apetag/Makefile.am b/gst/apetag/Makefile.am
index 714fa72..f0984af 100644 (file)
--- a/gst/apetag/Makefile.am
+++ b/gst/apetag/Makefile.am
@@ -11,7 +11,7 @@ libgstapetag_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 libgstapetag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstapetag_la_LIBTOOLFLAGS = --tag=disable-static
+libgstapetag_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstapedemux.h
 

diff --git a/gst/audiofx/Makefile.am b/gst/audiofx/Makefile.am
index 773a1f5..795483f 100644 (file)
--- a/gst/audiofx/Makefile.am
+++ b/gst/audiofx/Makefile.am
@@ -34,7 +34,7 @@ libgstaudiofx_la_LIBADD = $(GST_LIBS) \
        -lgstfft-$(GST_API_VERSION) \
        $(LIBM)
 libgstaudiofx_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaudiofx_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudiofx_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = audiopanorama.h \

diff --git a/gst/audioparsers/Makefile.am b/gst/audioparsers/Makefile.am
index 05aebdb..1263c93 100644 (file)
--- a/gst/audioparsers/Makefile.am
+++ b/gst/audioparsers/Makefile.am
@@ -12,7 +12,7 @@ libgstaudioparsers_la_LIBADD = \
        -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstaudioparsers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaudioparsers_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudioparsers_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstaacparse.h gstamrparse.h gstac3parse.h \
        gstdcaparse.h gstflacparse.h gstmpegaudioparse.h gstsbcparse.h \

diff --git a/gst/auparse/Makefile.am b/gst/auparse/Makefile.am
index f71bb7e..4e8bfd8 100644 (file)
--- a/gst/auparse/Makefile.am
+++ b/gst/auparse/Makefile.am
@@ -4,7 +4,7 @@ libgstauparse_la_SOURCES = gstauparse.c
 libgstauparse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstauparse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_LIBS) $(GST_BASE_LIBS)
 libgstauparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstauparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstauparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstauparse.h
 

diff --git a/gst/autodetect/Makefile.am b/gst/autodetect/Makefile.am
index 5bf57c7..f670147 100644 (file)
--- a/gst/autodetect/Makefile.am
+++ b/gst/autodetect/Makefile.am
@@ -9,7 +9,7 @@ libgstautodetect_la_SOURCES = \
 libgstautodetect_la_CFLAGS = $(GST_CFLAGS)
 libgstautodetect_la_LIBADD = $(GST_LIBS)
 libgstautodetect_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstautodetect_la_LIBTOOLFLAGS = --tag=disable-static
+libgstautodetect_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstautoaudiosink.h \

diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am
index a614e26..7170e1f 100644 (file)
--- a/gst/avi/Makefile.am
+++ b/gst/avi/Makefile.am
@@ -23,7 +23,7 @@ libgstavi_la_LIBADD = \
        -lgstvideo-@GST_API_VERSION@
 
 libgstavi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstavi_la_LIBTOOLFLAGS = --tag=disable-static
+libgstavi_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 EXTRA_DIST = README
 

diff --git a/gst/cutter/Makefile.am b/gst/cutter/Makefile.am
index 9d506af..f72f946 100644 (file)
--- a/gst/cutter/Makefile.am
+++ b/gst/cutter/Makefile.am
@@ -4,7 +4,7 @@ libgstcutter_la_SOURCES = gstcutter.c
 libgstcutter_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstcutter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LIBM)
 libgstcutter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcutter_la_LIBTOOLFLAGS = --tag=disable-static
+libgstcutter_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstcutter.h filter.func
 

diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am
index 91d68d1..1a953d4 100644 (file)
--- a/gst/debugutils/Makefile.am
+++ b/gst/debugutils/Makefile.am
@@ -18,7 +18,7 @@ libgstnavigationtest_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 libgstnavigationtest_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(LIBM)
 libgstnavigationtest_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstnavigationtest_la_LIBTOOLFLAGS = --tag=disable-static
+libgstnavigationtest_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 libgstdebug_la_SOURCES = \
        gstdebug.c \
@@ -38,7 +38,7 @@ libgstdebug_la_SOURCES = \
 libgstdebug_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstdebug_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
 libgstdebug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdebug_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdebug_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \

diff --git a/gst/deinterlace/Makefile.am b/gst/deinterlace/Makefile.am
index 5e44add..7d5dbb0 100644 (file)
--- a/gst/deinterlace/Makefile.am
+++ b/gst/deinterlace/Makefile.am
@@ -23,7 +23,7 @@ libgstdeinterlace_la_CFLAGS = \
 libgstdeinterlace_la_LIBADD = \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
 libgstdeinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdeinterlace_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdeinterlace_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstdeinterlace.h \

diff --git a/gst/dtmf/Makefile.am b/gst/dtmf/Makefile.am
index 56eda16..f5d36ed 100644 (file)
--- a/gst/dtmf/Makefile.am
+++ b/gst/dtmf/Makefile.am
@@ -14,7 +14,7 @@ libgstdtmf_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstdtmf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstrtp-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstdtmf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdtmf_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdtmf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \

diff --git a/gst/effectv/Makefile.am b/gst/effectv/Makefile.am
index 3fb2802..d09111d 100644 (file)
--- a/gst/effectv/Makefile.am
+++ b/gst/effectv/Makefile.am
@@ -15,7 +15,7 @@ libgsteffectv_la_LIBADD = \
        $(GST_LIBS) \
        $(LIBM)
 libgsteffectv_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsteffectv_la_LIBTOOLFLAGS = --tag=disable-static
+libgsteffectv_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gsteffectv.h gstaging.h gstdice.h gstedge.h \
         gstquark.h gstrev.h gstshagadelic.h gstvertigo.h gstwarp.h gstop.h \

diff --git a/gst/equalizer/Makefile.am b/gst/equalizer/Makefile.am
index 015875a..9f92a9e 100644 (file)
--- a/gst/equalizer/Makefile.am
+++ b/gst/equalizer/Makefile.am
@@ -12,7 +12,7 @@ libgstequalizer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) \
        $(GST_LIBS) $(LIBM)
 libgstequalizer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstequalizer_la_LIBTOOLFLAGS = --tag=disable-static
+libgstequalizer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstiirequalizer.h
 

diff --git a/gst/flv/Makefile.am b/gst/flv/Makefile.am
index 97c2341..7c1c52b 100644 (file)
--- a/gst/flv/Makefile.am
+++ b/gst/flv/Makefile.am
@@ -5,7 +5,7 @@ libgstflv_la_LIBADD = -lgstpbutils-@GST_API_VERSION@ -lgstaudio-@GST_API_VERSION
        $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 libgstflv_la_LDFLAGS = ${GST_PLUGIN_LDFLAGS}
 libgstflv_la_SOURCES = gstflvdemux.c gstflvmux.c
-libgstflv_la_LIBTOOLFLAGS = --tag=disable-static
+libgstflv_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstflvdemux.h gstflvmux.h amfdefs.h gstindex.h
 

diff --git a/gst/flx/Makefile.am b/gst/flx/Makefile.am
index 01d8bd8..3aa4eb0 100644 (file)
--- a/gst/flx/Makefile.am
+++ b/gst/flx/Makefile.am
@@ -4,7 +4,7 @@ libgstflxdec_la_SOURCES = gstflxdec.c flx_color.c
 libgstflxdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstflxdec_la_LIBADD = $(GST_BASE_LIBS)  $(GST_LIBS)
 libgstflxdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstflxdec_la_LIBTOOLFLAGS = --tag=disable-static
+libgstflxdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = flx_fmt.h flx_color.h gstflxdec.h
 

diff --git a/gst/goom/Makefile.am b/gst/goom/Makefile.am
index 500f0a8..7baa1ed 100644 (file)
--- a/gst/goom/Makefile.am
+++ b/gst/goom/Makefile.am
@@ -40,7 +40,7 @@ libgstgoom_la_SOURCES =                                               \
 libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(ARCH_CFLAGS) $(ORC_CFLAGS)
 libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(ORC_LIBS)
 libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgoom_la_LIBTOOLFLAGS = --tag=disable-static
+libgstgoom_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 EXTRA_DIST = $(PPC_FILES) $(MMX_FILES)
 

diff --git a/gst/goom2k1/Makefile.am b/gst/goom2k1/Makefile.am
index 3356b82..d88cc2f 100644 (file)
--- a/gst/goom2k1/Makefile.am
+++ b/gst/goom2k1/Makefile.am
@@ -12,7 +12,7 @@ libgstgoom2k1_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CF
 
 libgstgoom2k1_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstgoom2k1_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgoom2k1_la_LIBTOOLFLAGS = --tag=disable-static
+libgstgoom2k1_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 EXTRA_DIST = filters.c
 

diff --git a/gst/icydemux/Makefile.am b/gst/icydemux/Makefile.am
index 1da2af4..f7a4a82 100644 (file)
--- a/gst/icydemux/Makefile.am
+++ b/gst/icydemux/Makefile.am
@@ -4,7 +4,7 @@ libgsticydemux_la_SOURCES = gsticydemux.c
 libgsticydemux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgsticydemux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(ZLIB_LIBS)
 libgsticydemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsticydemux_la_LIBTOOLFLAGS = --tag=disable-static
+libgsticydemux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gsticydemux.h
 

diff --git a/gst/id3demux/Makefile.am b/gst/id3demux/Makefile.am
index 7dc98af..0c67df4 100644 (file)
--- a/gst/id3demux/Makefile.am
+++ b/gst/id3demux/Makefile.am
@@ -5,7 +5,7 @@ libgstid3demux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_C
 libgstid3demux_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ \
        -lgstpbutils-@GST_API_VERSION@ $(GST_BASE_LIBS)
 libgstid3demux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstid3demux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstid3demux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstid3demux.h
 

diff --git a/gst/imagefreeze/Makefile.am b/gst/imagefreeze/Makefile.am
index 7aa8614..e31288e 100644 (file)
--- a/gst/imagefreeze/Makefile.am
+++ b/gst/imagefreeze/Makefile.am
@@ -5,7 +5,7 @@ libgstimagefreeze_la_SOURCES = gstimagefreeze.c
 libgstimagefreeze_la_CFLAGS = $(GST_CFLAGS)
 libgstimagefreeze_la_LIBADD = $(GST_LIBS)
 libgstimagefreeze_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstimagefreeze_la_LIBTOOLFLAGS = --tag=disable-static
+libgstimagefreeze_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstimagefreeze.h
 

diff --git a/gst/interleave/Makefile.am b/gst/interleave/Makefile.am
index 75066a6..f27de70 100644 (file)
--- a/gst/interleave/Makefile.am
+++ b/gst/interleave/Makefile.am
@@ -5,7 +5,7 @@ libgstinterleave_la_SOURCES = plugin.c interleave.c deinterleave.c
 libgstinterleave_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstinterleave_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(GST_LIBS)
 libgstinterleave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstinterleave_la_LIBTOOLFLAGS = --tag=disable-static
+libgstinterleave_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = plugin.h interleave.h deinterleave.h
 

diff --git a/gst/isomp4/Makefile.am b/gst/isomp4/Makefile.am
index 4260b82..3e806f9 100644 (file)
--- a/gst/isomp4/Makefile.am
+++ b/gst/isomp4/Makefile.am
@@ -16,7 +16,7 @@ libgstisomp4_la_SOURCES = isomp4-plugin.c gstrtpxqtdepay.c \
        qtdemux.c qtdemux_types.c qtdemux_dump.c qtdemux_lang.c \
        gstqtmux.c gstqtmoovrecover.c atoms.c atomsrecovery.c descriptors.c \
        properties.c gstqtmuxmap.c
-libgstisomp4_la_LIBTOOLFLAGS = --tag=disable-static
+libgstisomp4_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        qtatomparser.h   \

diff --git a/gst/law/Makefile.am b/gst/law/Makefile.am
index addd3e3..430fd6d 100644 (file)
--- a/gst/law/Makefile.am
+++ b/gst/law/Makefile.am
@@ -5,14 +5,14 @@ libgstalaw_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstalaw_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstalaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstalaw_la_LIBTOOLFLAGS = --tag=disable-static
+libgstalaw_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 libgstmulaw_la_SOURCES = mulaw-encode.c mulaw-conversion.c mulaw-decode.c mulaw.c
 libgstmulaw_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstmulaw_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstmulaw_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmulaw_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmulaw_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = mulaw-conversion.h alaw-encode.h alaw-decode.h mulaw-encode.h mulaw-decode.h
 

diff --git a/gst/level/Makefile.am b/gst/level/Makefile.am
index 3aad695..cca655c 100644 (file)
--- a/gst/level/Makefile.am
+++ b/gst/level/Makefile.am
@@ -4,7 +4,7 @@ libgstlevel_la_SOURCES = gstlevel.c
 libgstlevel_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstlevel_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) $(GST_BASE_LIBS) $(LIBM)
 libgstlevel_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstlevel_la_LIBTOOLFLAGS = --tag=disable-static
+libgstlevel_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstlevel.h
 

diff --git a/gst/matroska/Makefile.am b/gst/matroska/Makefile.am
index 7e01bb7..3eab54e 100644 (file)
--- a/gst/matroska/Makefile.am
+++ b/gst/matroska/Makefile.am
@@ -40,7 +40,7 @@ libgstmatroska_la_LIBADD = \
        $(BZ2_LIBS) \
        $(LIBM)
 libgstmatroska_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmatroska_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmatroska_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 
 Android.mk: Makefile.am $(BUILT_SOURCES)

diff --git a/gst/monoscope/Makefile.am b/gst/monoscope/Makefile.am
index f869469..aac7b66 100644 (file)
--- a/gst/monoscope/Makefile.am
+++ b/gst/monoscope/Makefile.am
@@ -7,7 +7,7 @@ noinst_HEADERS = gstmonoscope.h monoscope.h convolve.h
 libgstmonoscope_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
 libgstmonoscope_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
 libgstmonoscope_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmonoscope_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmonoscope_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \

diff --git a/gst/multifile/Makefile.am b/gst/multifile/Makefile.am
index 00fb35d..4195bdc 100644 (file)
--- a/gst/multifile/Makefile.am
+++ b/gst/multifile/Makefile.am
@@ -10,7 +10,7 @@ libgstmultifile_la_SOURCES = \
 libgstmultifile_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgstmultifile_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
 libgstmultifile_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmultifile_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmultifile_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstmultifilesrc.h gstmultifilesink.h gstsplitfilesrc.h patternspec.h
 

diff --git a/gst/multipart/Makefile.am b/gst/multipart/Makefile.am
index 8ec931e..124c67f 100644 (file)
--- a/gst/multipart/Makefile.am
+++ b/gst/multipart/Makefile.am
@@ -4,7 +4,7 @@ libgstmultipart_la_SOURCES = multipart.c multipartdemux.c multipartmux.c
 libgstmultipart_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstmultipart_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
 libgstmultipart_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmultipart_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmultipart_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = multipartdemux.h multipartmux.h
 

diff --git a/gst/replaygain/Makefile.am b/gst/replaygain/Makefile.am
index 628b319..d352f18 100644 (file)
--- a/gst/replaygain/Makefile.am
+++ b/gst/replaygain/Makefile.am
@@ -12,7 +12,7 @@ libgstreplaygain_la_LIBADD  = \
        $(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstaudio-$(GST_API_VERSION)\
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstreplaygain_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstreplaygain_la_LIBTOOLFLAGS = --tag=disable-static
+libgstreplaygain_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS =         \

diff --git a/gst/rtp/Makefile.am b/gst/rtp/Makefile.am
index eeb224a..7b83b18 100644 (file)
--- a/gst/rtp/Makefile.am
+++ b/gst/rtp/Makefile.am
@@ -89,7 +89,7 @@ libgstrtp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        $(GST_BASE_LIBS) $(GST_LIBS) \
        $(LIBM)
 libgstrtp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
-libgstrtp_la_LIBTOOLFLAGS = --tag=disable-static
+libgstrtp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS =                       \
        dboolhuff.h \

diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am
index 662b18c..d65f676 100644 (file)
--- a/gst/rtpmanager/Makefile.am
+++ b/gst/rtpmanager/Makefile.am
@@ -48,7 +48,7 @@ libgstrtpmanager_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        $(GST_NET_LIBS) -lgstrtp-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS_LIBS)
 libgstrtpmanager_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrtpmanager_la_LIBTOOLFLAGS = --tag=disable-static
+libgstrtpmanager_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/gst/rtsp/Makefile.am b/gst/rtsp/Makefile.am
index f4f43d7..1f0213b 100644 (file)
--- a/gst/rtsp/Makefile.am
+++ b/gst/rtsp/Makefile.am
@@ -8,7 +8,7 @@ libgstrtsp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(GST_BASE_LIBS) \
                       -lgstrtp-@GST_API_VERSION@ -lgstrtsp-@GST_API_VERSION@ \
                       -lgstsdp-@GST_API_VERSION@ -lgstnet-@GST_API_VERSION@ $(GST_LIBS)
 libgstrtsp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrtsp_la_LIBTOOLFLAGS = --tag=disable-static
+libgstrtsp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstrtspsrc.h     \
                 gstrtsp.h        \

diff --git a/gst/shapewipe/Makefile.am b/gst/shapewipe/Makefile.am
index ed29db7..76758ea 100644 (file)
--- a/gst/shapewipe/Makefile.am
+++ b/gst/shapewipe/Makefile.am
@@ -5,7 +5,7 @@ libgstshapewipe_la_SOURCES = gstshapewipe.c
 libgstshapewipe_la_CFLAGS = $(GIO_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstshapewipe_la_LIBADD = $(GIO_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@
 libgstshapewipe_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstshapewipe_la_LIBTOOLFLAGS = --tag=disable-static
+libgstshapewipe_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstshapewipe.h
 

diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am
index 0462a5c..22a19fe 100644 (file)
--- a/gst/smpte/Makefile.am
+++ b/gst/smpte/Makefile.am
@@ -8,7 +8,7 @@ libgstsmpte_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstsmpte_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(LIBM) \
                        -lgstvideo-$(GST_API_VERSION) 
 libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsmpte_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsmpte_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
        androgenizer \

diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am
index b194909..2f465ca 100644 (file)
--- a/gst/spectrum/Makefile.am
+++ b/gst/spectrum/Makefile.am
@@ -7,7 +7,7 @@ libgstspectrum_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        -lgstfft-$(GST_API_VERSION) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstspectrum_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstspectrum_la_LIBTOOLFLAGS = --tag=disable-static
+libgstspectrum_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstspectrum.h
 

diff --git a/gst/udp/Makefile.am b/gst/udp/Makefile.am
index 1611238..53e4c06 100644 (file)
--- a/gst/udp/Makefile.am
+++ b/gst/udp/Makefile.am
@@ -18,7 +18,7 @@ libgstudp_la_SOURCES = gstudp.c gstudpsrc.c gstudpsink.c gstmultiudpsink.c gstdy
 libgstudp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_NET_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgstudp_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_NET_LIBS) $(GIO_LIBS)
 libgstudp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstudp_la_LIBTOOLFLAGS = --tag=disable-static
+libgstudp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 nodist_libgstudp_la_SOURCES = \
         $(built_sources)

diff --git a/gst/videobox/Makefile.am b/gst/videobox/Makefile.am
index a852706..32e1c5d 100644 (file)
--- a/gst/videobox/Makefile.am
+++ b/gst/videobox/Makefile.am
@@ -15,7 +15,7 @@ libgstvideobox_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                           $(ORC_LIBS) \
                           -lgstvideo-@GST_API_VERSION@
 libgstvideobox_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideobox_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideobox_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideobox.h
 EXTRA_DIST += README

diff --git a/gst/videocrop/Makefile.am b/gst/videocrop/Makefile.am
index 4f59b53..8491444 100644 (file)
--- a/gst/videocrop/Makefile.am
+++ b/gst/videocrop/Makefile.am
@@ -8,7 +8,7 @@ libgstvideocrop_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS)
 libgstvideocrop_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION)
 libgstvideocrop_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideocrop_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideocrop_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideocrop.h gstaspectratiocrop.h
 

diff --git a/gst/videofilter/Makefile.am b/gst/videofilter/Makefile.am
index 0422e12..71755e6 100644 (file)
--- a/gst/videofilter/Makefile.am
+++ b/gst/videofilter/Makefile.am
@@ -17,7 +17,7 @@ libgstvideofilter_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                        -lgstvideo-@GST_API_VERSION@ \
                        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideofilter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
-libgstvideofilter_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideofilter_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 gstvideoexample.c: $(srcdir)/make_filter $(srcdir)/gstvideotemplate.c
        $(srcdir)/make_filter Videoexample $(srcdir)/gstvideotemplate.c

diff --git a/gst/videomixer/Makefile.am b/gst/videomixer/Makefile.am
index f944759..767337e 100644 (file)
--- a/gst/videomixer/Makefile.am
+++ b/gst/videomixer/Makefile.am
@@ -14,7 +14,7 @@ libgstvideomixer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        -lgstvideo-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
 libgstvideomixer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideomixer_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideomixer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = \

diff --git a/gst/wavenc/Makefile.am b/gst/wavenc/Makefile.am
index 320c8fd..4bfdf50 100644 (file)
--- a/gst/wavenc/Makefile.am
+++ b/gst/wavenc/Makefile.am
@@ -10,7 +10,7 @@ libgstwavenc_la_LIBADD =      \
        -lgstriff-@GST_API_VERSION@ \
        $(GST_LIBS)
 libgstwavenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstwavenc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstwavenc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstwavenc.h
 

diff --git a/gst/wavparse/Makefile.am b/gst/wavparse/Makefile.am
index 039b6a6..2a0aa40 100644 (file)
--- a/gst/wavparse/Makefile.am
+++ b/gst/wavparse/Makefile.am
@@ -14,7 +14,7 @@ libgstwavparse_la_LIBADD = \
        $(GST_LIBS) \
        $(LIBM)
 libgstwavparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstwavparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstwavparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstwavparse.h
 

diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am
index 868597e..ae424f9 100644 (file)
--- a/gst/y4m/Makefile.am
+++ b/gst/y4m/Makefile.am
@@ -5,7 +5,7 @@ libgsty4menc_la_SOURCES = gsty4mencode.c
 libgsty4menc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgsty4menc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) $(GST_LIBS)
 libgsty4menc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsty4menc_la_LIBTOOLFLAGS = --tag=disable-static
+libgsty4menc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gsty4mencode.h
 

diff --git a/sys/directsound/Makefile.am b/sys/directsound/Makefile.am
index e4211dc..9581d28 100644 (file)
--- a/sys/directsound/Makefile.am
+++ b/sys/directsound/Makefile.am
@@ -13,6 +13,6 @@ libgstdirectsoundsink_la_LIBADD = \
        $(GST_LIBS) \
        $(DIRECTSOUND_LIBS)
 libgstdirectsoundsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DIRECTSOUND_LDFLAGS)\r
-libgstdirectsoundsink_la_LIBTOOLFLAGS = --tag=disable-static\r
+libgstdirectsoundsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)\r
 \r
 noinst_HEADERS = gstdirectsoundsink.h

diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am
index 057d300..a94766b 100644 (file)
--- a/sys/oss/Makefile.am
+++ b/sys/oss/Makefile.am
@@ -12,7 +12,7 @@ libgstossaudio_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
-libgstossaudio_la_LIBTOOLFLAGS = --tag=disable-static
+libgstossaudio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = common.h            \
                gstosssink.h         \

diff --git a/sys/oss4/Makefile.am b/sys/oss4/Makefile.am
index 8e7b466..a22475a 100644 (file)
--- a/sys/oss4/Makefile.am
+++ b/sys/oss4/Makefile.am
@@ -12,7 +12,7 @@ libgstoss4audio_la_LIBADD = \
        -lgstaudio-$(GST_API_VERSION) \
        $(GST_LIBS)
 libgstoss4audio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
-libgstoss4audio_la_LIBTOOLFLAGS = --tag=disable-static
+libgstoss4audio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        oss4-audio.h          \

diff --git a/sys/osxaudio/Makefile.am b/sys/osxaudio/Makefile.am
index 6f75b12..3203043 100644 (file)
--- a/sys/osxaudio/Makefile.am
+++ b/sys/osxaudio/Makefile.am
@@ -23,7 +23,7 @@ if !HAVE_IOS
 libgstosxaudio_la_LDFLAGS += -Wl,-framework,AudioUnit -Wl,-framework,CoreServices
 endif
 
-libgstosxaudio_la_LIBTOOLFLAGS = --tag=disable-static --tag=CC
+libgstosxaudio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) --tag=CC
 
 noinst_HEADERS = gstosxaudiosink.h       \
                  gstosxaudioelement.h \

diff --git a/sys/osxvideo/Makefile.am b/sys/osxvideo/Makefile.am
index cd69504..994b48c 100644 (file)
--- a/sys/osxvideo/Makefile.am
+++ b/sys/osxvideo/Makefile.am
@@ -13,6 +13,6 @@ libgstosxvideosink_la_LIBADD =  \
        -lgstvideo-$(GST_API_VERSION)
 
 libgstosxvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,-framework -Wl,Cocoa -Wl,-framework -Wl,QuickTime -Wl,-framework -Wl,OpenGL
-libgstosxvideosink_la_LIBTOOLFLAGS = --tag=disable-static
+libgstosxvideosink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = osxvideosink.h cocoawindow.h

diff --git a/sys/sunaudio/Makefile.am b/sys/sunaudio/Makefile.am
index 7305468..86b62da 100644 (file)
--- a/sys/sunaudio/Makefile.am
+++ b/sys/sunaudio/Makefile.am
@@ -15,7 +15,7 @@ libgstsunaudio_la_LIBADD = \
         $(GST_PLUGINS_BASE_LIBS) \
         $(GST_LIBS)
 libgstsunaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsunaudio_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsunaudio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsunaudiosink.h \
                  gstsunaudiomixer.h \

diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am
index 6b5134f..cec939b 100644 (file)
--- a/sys/v4l2/Makefile.am
+++ b/sys/v4l2/Makefile.am
@@ -54,7 +54,7 @@ libgstvideo4linux2_la_CFLAGS =   $(GST_PLUGINS_BASE_CFLAGS) \
                                 $(GUDEV_CFLAGS)
 
 libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideo4linux2_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideo4linux2_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 libgstvideo4linux2_la_LIBADD =   $(GST_PLUGINS_BASE_LIBS) \
                                 -lgstallocators-$(GST_API_VERSION) \
                                 -lgstvideo-$(GST_API_VERSION) \

diff --git a/sys/waveform/Makefile.am b/sys/waveform/Makefile.am
index 338c805..75dc7c4 100644 (file)
--- a/sys/waveform/Makefile.am
+++ b/sys/waveform/Makefile.am
@@ -10,7 +10,7 @@ libgstwaveformsink_la_LIBADD = \
        $(GST_LIBS) \
        -lwinmm
 libgstwaveformsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstwaveformsink_la_LIBTOOLFLAGS = --tag=disable-static
+libgstwaveformsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstwaveformsink.h
 

diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index e8e11f0..5671775 100644 (file)
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -11,6 +11,6 @@ libgstximagesrc_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(X_LIBS) $(XSHM_LIBS) $(XFIXES_LIBS) $(XDAMAGE_LIBS) 
 libgstximagesrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstximagesrc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstximagesrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstximagesrc.h ximageutil.h