gst: Add better support for static plugins

72 files changed, 72 insertions, 72 deletions

diff --git a/gst/accurip/Makefile.am b/gst/accurip/Makefile.am
index ff8ad462f..178000bce 100644
--- a/gst/accurip/Makefile.am
+++ b/gst/accurip/Makefile.am
@@ -10,6 +10,6 @@ libgstaccurip_la_LIBADD = \
 	$(GST_BASE_LIBS) $(GST_LIBS) \
 	$(ACCURIP_LIBS)
 libgstaccurip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaccurip_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaccurip_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstaccurip.h
diff --git a/gst/adpcmdec/Makefile.am b/gst/adpcmdec/Makefile.am
index 16b29e596..62cb95192 100644
--- a/gst/adpcmdec/Makefile.am
+++ b/gst/adpcmdec/Makefile.am
@@ -10,7 +10,7 @@ libgstadpcmdec_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstadpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstadpcmdec_la_LIBTOOLFLAGS = --tag=disable-static
+libgstadpcmdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/adpcmenc/Makefile.am b/gst/adpcmenc/Makefile.am
index 1ae6ebaaa..faf3b4a93 100644
--- a/gst/adpcmenc/Makefile.am
+++ b/gst/adpcmenc/Makefile.am
@@ -9,7 +9,7 @@ libgstadpcmenc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstadpcmenc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_LIBS)
 libgstadpcmenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstadpcmenc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstadpcmenc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/aiff/Makefile.am b/gst/aiff/Makefile.am
index 7154d3bc8..ab971ef6f 100644
--- a/gst/aiff/Makefile.am
+++ b/gst/aiff/Makefile.am
@@ -11,7 +11,7 @@ libgstaiff_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(LIBM)
 libgstaiff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaiff_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaiff_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = aiffmux.h aiffparse.h
 
diff --git a/gst/asfmux/Makefile.am b/gst/asfmux/Makefile.am
index 0c23883dc..ded604886 100644
--- a/gst/asfmux/Makefile.am
+++ b/gst/asfmux/Makefile.am
@@ -15,7 +15,7 @@ libgstasfmux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(
 libgstasfmux_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
                          -lgstrtp-@GST_API_VERSION@
 libgstasfmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstasfmux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstasfmux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = gstasfmux.h \
diff --git a/gst/audiobuffer/Makefile.am b/gst/audiobuffer/Makefile.am
index 4bf528f0b..9b1f1abbe 100644
--- a/gst/audiobuffer/Makefile.am
+++ b/gst/audiobuffer/Makefile.am
@@ -7,7 +7,7 @@ libgstaudiobuffer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
 			   -lgstaudio-$(GST_API_VERSION)
 
 libgstaudiobuffer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaudiobuffer_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudiobuffer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/audiovisualizers/Makefile.am b/gst/audiovisualizers/Makefile.am
index 496e4cc3b..a26a1ed08 100644
--- a/gst/audiovisualizers/Makefile.am
+++ b/gst/audiovisualizers/Makefile.am
@@ -15,7 +15,7 @@ libgstaudiovisualizers_la_LIBADD = \
 	-lgstvideo-$(GST_API_VERSION) -lgstfft-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS)  $(GST_LIBS) $(LIBM)
 libgstaudiovisualizers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaudiovisualizers_la_LIBTOOLFLAGS = --tag=disable-static
+libgstaudiovisualizers_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstaudiovisualizer.h gstdrawhelpers.h \
 	gstspacescope.h gstspectrascope.h gstsynaescope.h gstwavescope.h
diff --git a/gst/autoconvert/Makefile.am b/gst/autoconvert/Makefile.am
index faa0d9cd0..35f73ebde 100644
--- a/gst/autoconvert/Makefile.am
+++ b/gst/autoconvert/Makefile.am
@@ -5,7 +5,7 @@ libgstautoconvert_la_SOURCES = gstautoconvert.c gstautovideoconvert.c plugin.c
 libgstautoconvert_la_CFLAGS = $(GST_CFLAGS)
 libgstautoconvert_la_LIBADD = $(GST_LIBS)
 libgstautoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstautoconvert_la_LIBTOOLFLAGS = --tag=disable-static
+libgstautoconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstautoconvert.h gstautovideoconvert.h
 
diff --git a/gst/bayer/Makefile.am b/gst/bayer/Makefile.am
index 53c810fd2..3754dab59 100644
--- a/gst/bayer/Makefile.am
+++ b/gst/bayer/Makefile.am
@@ -18,7 +18,7 @@ libgstbayer_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
     $(ORC_LIBS) \
     $(GST_BASE_LIBS)
 libgstbayer_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstbayer_la_LIBTOOLFLAGS = --tag=disable-static
+libgstbayer_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 nodist_libgstbayer_la_SOURCES = $(ORC_NODIST_SOURCES)
 
 
diff --git a/gst/camerabin2/Makefile.am b/gst/camerabin2/Makefile.am
index 0947b114a..db7d8c062 100644
--- a/gst/camerabin2/Makefile.am
+++ b/gst/camerabin2/Makefile.am
@@ -19,7 +19,7 @@ libgstcamerabin2_la_LIBADD = \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 
 libgstcamerabin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcamerabin2_la_LIBTOOLFLAGS = --tag=disable-static
+libgstcamerabin2_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstviewfinderbin.h \
 		camerabingeneral.h \
diff --git a/gst/cdxaparse/Makefile.am b/gst/cdxaparse/Makefile.am
index bcf78287d..673e87ab6 100644
--- a/gst/cdxaparse/Makefile.am
+++ b/gst/cdxaparse/Makefile.am
@@ -21,7 +21,7 @@ libgstcdxaparse_la_LIBADD = \
 	-lgstriff-@GST_API_VERSION@
 
 libgstcdxaparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcdxaparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstcdxaparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/coloreffects/Makefile.am b/gst/coloreffects/Makefile.am
index 839f12762..1b75db77d 100644
--- a/gst/coloreffects/Makefile.am
+++ b/gst/coloreffects/Makefile.am
@@ -13,7 +13,7 @@ libgstcoloreffects_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstcoloreffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcoloreffects_la_LIBTOOLFLAGS = --tag=disable-static
+libgstcoloreffects_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstcoloreffects.h gstchromahold.h
 
diff --git a/gst/dataurisrc/Makefile.am b/gst/dataurisrc/Makefile.am
index 810ae0cfe..37c8db349 100644
--- a/gst/dataurisrc/Makefile.am
+++ b/gst/dataurisrc/Makefile.am
@@ -5,7 +5,7 @@ libgstdataurisrc_la_SOURCES = gstdataurisrc.c gstdataurisrc.h
 libgstdataurisrc_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstdataurisrc_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
 libgstdataurisrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdataurisrc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdataurisrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/dccp/Makefile.am b/gst/dccp/Makefile.am
index 781ef0e6a..31b66132c 100644
--- a/gst/dccp/Makefile.am
+++ b/gst/dccp/Makefile.am
@@ -14,7 +14,7 @@ libgstdccp_la_SOURCES = gstdccpplugin.c \
 libgstdccp_la_CFLAGS = $(GST_CFLAGS)
 libgstdccp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(DCCP_LIBS) $(WINSOCK2_LIBS)
 libgstdccp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdccp_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdccp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = gstdccp.h \
diff --git a/gst/debugutils/Makefile.am b/gst/debugutils/Makefile.am
index bd6cd60fc..c7dd34301 100644
--- a/gst/debugutils/Makefile.am
+++ b/gst/debugutils/Makefile.am
@@ -34,7 +34,7 @@ libgstdebugutilsbad_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
 	-lgstvideo-$(GST_API_VERSION) \
 	$(GST_LIBS)
 libgstdebugutilsbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdebugutilsbad_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdebugutilsbad_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = fpsdisplaysink.h
 
diff --git a/gst/dvbsuboverlay/Makefile.am b/gst/dvbsuboverlay/Makefile.am
index 8577316bd..5f5c80602 100644
--- a/gst/dvbsuboverlay/Makefile.am
+++ b/gst/dvbsuboverlay/Makefile.am
@@ -5,7 +5,7 @@ libgstdvbsuboverlay_la_SOURCES = dvb-sub.c gstdvbsuboverlay.c
 libgstdvbsuboverlay_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstdvbsuboverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS)
 libgstdvbsuboverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvbsuboverlay_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdvbsuboverlay_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdvbsuboverlay.h dvb-sub.h
 
diff --git a/gst/dvdspu/Makefile.am b/gst/dvdspu/Makefile.am
index b616aae52..e28daeb59 100644
--- a/gst/dvdspu/Makefile.am
+++ b/gst/dvdspu/Makefile.am
@@ -7,7 +7,7 @@ libgstdvdspu_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(
 libgstdvdspu_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
      $(GST_LIBS)
 libgstdvdspu_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdspu_la_LIBTOOLFLAGS = --tag=disable-static
+libgstdvdspu_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdvdspu.h gstspu-pgs.h gstspu-vobsub.h gstspu-common.h
 
diff --git a/gst/faceoverlay/Makefile.am b/gst/faceoverlay/Makefile.am
index 74ce30a4e..31a438216 100644
--- a/gst/faceoverlay/Makefile.am
+++ b/gst/faceoverlay/Makefile.am
@@ -7,7 +7,7 @@ libgstfaceoverlay_la_SOURCES = gstfaceoverlay.c
 libgstfaceoverlay_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstfaceoverlay_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_LIBS)
 libgstfaceoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstfaceoverlay_la_LIBTOOLFLAGS = --tag=disable-static
+libgstfaceoverlay_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = gstfaceoverlay.h
diff --git a/gst/festival/Makefile.am b/gst/festival/Makefile.am
index e61835923..16ed2871b 100644
--- a/gst/festival/Makefile.am
+++ b/gst/festival/Makefile.am
@@ -8,7 +8,7 @@ libgstfestival_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstfestival_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) \
                            -lgstaudio-1.0 $(WINSOCK2_LIBS)
 libgstfestival_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstfestival_la_LIBTOOLFLAGS = --tag=disable-static
+libgstfestival_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstfestival.h 
 
diff --git a/gst/fieldanalysis/Makefile.am b/gst/fieldanalysis/Makefile.am
index e97351aa0..bd06de5cb 100644
--- a/gst/fieldanalysis/Makefile.am
+++ b/gst/fieldanalysis/Makefile.am
@@ -19,6 +19,6 @@ libgstfieldanalysis_la_LIBADD = \
 	$(ORC_LIBS)
 
 libgstfieldanalysis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstfieldanalysis_la_LIBTOOLFLAGS = --tag=disable-static
+libgstfieldanalysis_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstfieldanalysis.h
diff --git a/gst/freeverb/Makefile.am b/gst/freeverb/Makefile.am
index f55a621d5..f1a5637fc 100644
--- a/gst/freeverb/Makefile.am
+++ b/gst/freeverb/Makefile.am
@@ -14,7 +14,7 @@ libgstfreeverb_la_LIBADD = $(GST_LIBS) \
 	-lgstaudio-$(GST_API_VERSION) \
 	$(LIBM)
 libgstfreeverb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstfreeverb_la_LIBTOOLFLAGS = --tag=disable-static
+libgstfreeverb_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = gstfreeverb.h
diff --git a/gst/frei0r/Makefile.am b/gst/frei0r/Makefile.am
index 933e486b8..ba0e7f51e 100644
--- a/gst/frei0r/Makefile.am
+++ b/gst/frei0r/Makefile.am
@@ -10,7 +10,7 @@ libgstfrei0r_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFL
 libgstfrei0r_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(GMODULE_NO_EXPORT_LIBS)
 libgstfrei0r_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstfrei0r_la_LIBTOOLFLAGS = --tag=disable-static
+libgstfrei0r_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstfrei0r.h gstfrei0rfilter.h gstfrei0rsrc.h gstfrei0rmixer.h frei0r.h
 
diff --git a/gst/games/Makefile.am b/gst/games/Makefile.am
index d1f8aa480..d85c89d37 100644
--- a/gst/games/Makefile.am
+++ b/gst/games/Makefile.am
@@ -8,6 +8,6 @@ libgstpuzzle_la_SOURCES = \
 libgstpuzzle_la_CFLAGS = $(GST_CFLAGS) $(LIBOIL_CFLAGS) -I$(top_srcdir)/gst/videofilter
 libgstpuzzle_la_LIBADD =
 libgstpuzzle_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBOIL_LIBS)
-libgstpuzzle_la_LIBTOOLFLAGS = --tag=disable-static
+libgstpuzzle_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideoimage.h
diff --git a/gst/gaudieffects/Makefile.am b/gst/gaudieffects/Makefile.am
index 8db8522a2..d25794ce8 100644
--- a/gst/gaudieffects/Makefile.am
+++ b/gst/gaudieffects/Makefile.am
@@ -26,7 +26,7 @@ libgstgaudieffects_la_LIBADD = \
     $(LIBM) \
     $(ORC_LIBS)
 libgstgaudieffects_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgaudieffects_la_LIBTOOLFLAGS = --tag=disable-static
+libgstgaudieffects_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = \
diff --git a/gst/gdp/Makefile.am b/gst/gdp/Makefile.am
index 990f967d3..1e59eed6c 100644
--- a/gst/gdp/Makefile.am
+++ b/gst/gdp/Makefile.am
@@ -9,7 +9,7 @@ libgstgdp_la_SOURCES = \
 libgstgdp_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstgdp_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstgdp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgdp_la_LIBTOOLFLAGS = --tag=disable-static
+libgstgdp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	dataprotocol.h \
diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am
index b34007bc7..67f3d1c1b 100644
--- a/gst/geometrictransform/Makefile.am
+++ b/gst/geometrictransform/Makefile.am
@@ -27,7 +27,7 @@ libgstgeometrictransform_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                             $(GST_BASE_LIBS) \
                             $(GST_LIBS) $(LIBM)
 libgstgeometrictransform_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgeometrictransform_la_LIBTOOLFLAGS = --tag=disable-static
+libgstgeometrictransform_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstgeometrictransform.h \
                  gstcirclegeometrictransform.h \
diff --git a/gst/hdvparse/Makefile.am b/gst/hdvparse/Makefile.am
index 20b09228d..c3e05ea30 100644
--- a/gst/hdvparse/Makefile.am
+++ b/gst/hdvparse/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = \
 libgsthdvparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgsthdvparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(LIBM)
 libgsthdvparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsthdvparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgsthdvparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/id3tag/Makefile.am b/gst/id3tag/Makefile.am
index 8b39b119e..ae7ab97e0 100644
--- a/gst/id3tag/Makefile.am
+++ b/gst/id3tag/Makefile.am
@@ -13,7 +13,7 @@ libgstid3tag_la_LIBADD = \
 	$(GST_LIBS)
 
 libgstid3tag_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstid3tag_la_LIBTOOLFLAGS = --tag=disable-static
+libgstid3tag_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstid3mux.h id3tag.h
 
diff --git a/gst/inter/Makefile.am b/gst/inter/Makefile.am
index 5ae09850f..48480b5d2 100644
--- a/gst/inter/Makefile.am
+++ b/gst/inter/Makefile.am
@@ -34,7 +34,7 @@ libgstinter_la_LIBADD = \
 	$(LIBM)
 
 libgstinter_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstinter_la_LIBTOOLFLAGS = --tag=disable-static
+libgstinter_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 gstintertest_SOURCES = \
 	gstintertest.c
diff --git a/gst/interlace/Makefile.am b/gst/interlace/Makefile.am
index 53ec1954e..e32121380 100644
--- a/gst/interlace/Makefile.am
+++ b/gst/interlace/Makefile.am
@@ -13,7 +13,7 @@ libgstinterlace_la_LIBADD = \
 	$(LIBM)
 
 libgstinterlace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstinterlace_la_LIBTOOLFLAGS = --tag=disable-static
+libgstinterlace_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/ivfparse/Makefile.am b/gst/ivfparse/Makefile.am
index 684c4527f..d5167c557 100644
--- a/gst/ivfparse/Makefile.am
+++ b/gst/ivfparse/Makefile.am
@@ -8,7 +8,7 @@ libgstivfparse_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstivfparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstivfparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstivfparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstivfparse.h
 
diff --git a/gst/ivtc/Makefile.am b/gst/ivtc/Makefile.am
index c451c396e..5b1ce9466 100644
--- a/gst/ivtc/Makefile.am
+++ b/gst/ivtc/Makefile.am
@@ -8,7 +8,7 @@ libgstivtc_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 libgstivtc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-1.0 \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstivtc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstivtc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstivtc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 
 EXTRA_DIST =
diff --git a/gst/jp2kdecimator/Makefile.am b/gst/jp2kdecimator/Makefile.am
index ad971b819..780a983da 100644
--- a/gst/jp2kdecimator/Makefile.am
+++ b/gst/jp2kdecimator/Makefile.am
@@ -9,7 +9,7 @@ libgstjp2kdecimator_la_CFLAGS = \
 libgstjp2kdecimator_la_LIBADD = \
     $(GST_LIBS) $(GST_BASE_LIBS)
 libgstjp2kdecimator_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstjp2kdecimator_la_LIBTOOLFLAGS = --tag=disable-static
+libgstjp2kdecimator_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstjp2kdecimator.h jp2kcodestream.h
 
diff --git a/gst/jpegformat/Makefile.am b/gst/jpegformat/Makefile.am
index 03125b574..dc480b79f 100644
--- a/gst/jpegformat/Makefile.am
+++ b/gst/jpegformat/Makefile.am
@@ -6,7 +6,7 @@ libgstjpegformat_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
 libgstjpegformat_la_LIBADD = \
     $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
 libgstjpegformat_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstjpegformat_la_LIBTOOLFLAGS = --tag=disable-static
+libgstjpegformat_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstjpegformat.h gstjpegparse.h gstjifmux.h
 
diff --git a/gst/librfb/Makefile.am b/gst/librfb/Makefile.am
index 58d7af946..342bd6f69 100644
--- a/gst/librfb/Makefile.am
+++ b/gst/librfb/Makefile.am
@@ -7,7 +7,7 @@ libgstrfbsrc_la_SOURCES = gstrfbsrc.c
 libgstrfbsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(X11_CFLAGS) -I$(srcdir)/..
 libgstrfbsrc_la_LIBADD = $(GST_BASE_LIBS) $(X11_LIBS) $(WINSOCK2_LIBS) librfb.la
 libgstrfbsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrfbsrc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstrfbsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 librfb_la_SOURCES = \
 	rfbbuffer.c \
diff --git a/gst/liveadder/Makefile.am b/gst/liveadder/Makefile.am
index 303503f40..d9cc7cf72 100644
--- a/gst/liveadder/Makefile.am
+++ b/gst/liveadder/Makefile.am
@@ -6,7 +6,7 @@ libgstliveadder_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstliveadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstliveadder_la_LIBTOOLFLAGS = --tag=disable-static
+libgstliveadder_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = liveadder.h
 
diff --git a/gst/midi/Makefile.am b/gst/midi/Makefile.am
index 4ed1a4cdd..058a778ee 100644
--- a/gst/midi/Makefile.am
+++ b/gst/midi/Makefile.am
@@ -11,7 +11,7 @@ libgstmidi_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(LIBM)
 libgstmidi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmidi_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmidi_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = midiparse.h
 
diff --git a/gst/mixmatrix/Makefile.am b/gst/mixmatrix/Makefile.am
index e4f37ef9e..cae71f86d 100644
--- a/gst/mixmatrix/Makefile.am
+++ b/gst/mixmatrix/Makefile.am
@@ -5,5 +5,5 @@ libgstmixmatrix_la_SOURCES = mixmatrix.c
 libgstmixmatrix_la_CFLAGS = $(GST_CFLAGS)
 libgstmixmatrix_la_LIBADD =
 libgstmixmatrix_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmixmatrix_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmixmatrix_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am
index aa723476c..8e24e8633 100644
--- a/gst/mpeg1sys/Makefile.am
+++ b/gst/mpeg1sys/Makefile.am
@@ -7,7 +7,7 @@ libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \
 libgstmpeg1systemencode_la_CFLAGS = $(GST_CFLAGS)
 libgstmpeg1systemencode_la_LIBADD =
 libgstmpeg1systemencode_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpeg1systemencode_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmpeg1systemencode_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstmpeg1systemencode.h \
 		 main.h \
diff --git a/gst/mpegdemux/Makefile.am b/gst/mpegdemux/Makefile.am
index 6fba753ed..41cdd899e 100644
--- a/gst/mpegdemux/Makefile.am
+++ b/gst/mpegdemux/Makefile.am
@@ -12,7 +12,7 @@ libgstmpegpsdemux_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegpsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpegpsdemux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmpegpsdemux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstmpegdefs.h   \
diff --git a/gst/mpegpsmux/Makefile.am b/gst/mpegpsmux/Makefile.am
index 26ac56cc9..457465eab 100644
--- a/gst/mpegpsmux/Makefile.am
+++ b/gst/mpegpsmux/Makefile.am
@@ -10,7 +10,7 @@ libgstmpegpsmux_la_SOURCES = \
 libgstmpegpsmux_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstmpegpsmux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegpsmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpegpsmux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmpegpsmux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	mpegpsmux.h \
diff --git a/gst/mpegtsdemux/Makefile.am b/gst/mpegtsdemux/Makefile.am
index e6b727e42..99a65932a 100644
--- a/gst/mpegtsdemux/Makefile.am
+++ b/gst/mpegtsdemux/Makefile.am
@@ -16,7 +16,7 @@ libgstmpegtsdemux_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegtsdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpegtsdemux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmpegtsdemux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstmpegdefs.h   \
diff --git a/gst/mpegtsmux/Makefile.am b/gst/mpegtsmux/Makefile.am
index 6a218063c..845419be7 100644
--- a/gst/mpegtsmux/Makefile.am
+++ b/gst/mpegtsmux/Makefile.am
@@ -11,7 +11,7 @@ libgstmpegtsmux_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_
 libgstmpegtsmux_la_LIBADD = $(top_builddir)/gst/mpegtsmux/tsmux/libtsmux.la \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
 libgstmpegtsmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpegtsmux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmpegtsmux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	mpegtsmux.h \
diff --git a/gst/mve/Makefile.am b/gst/mve/Makefile.am
index 8be4517d3..20b510018 100644
--- a/gst/mve/Makefile.am
+++ b/gst/mve/Makefile.am
@@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstmve.la
 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
+libgstmve_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 libgstmve_la_SOURCES = \
 	gstmve.c \
diff --git a/gst/mxf/Makefile.am b/gst/mxf/Makefile.am
index 0067d0ab9..ce1903364 100644
--- a/gst/mxf/Makefile.am
+++ b/gst/mxf/Makefile.am
@@ -24,7 +24,7 @@ libgstmxf_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
 	-lgstvideo-@GST_API_VERSION@ \
 	-lgstaudio-@GST_API_VERSION@
 libgstmxf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmxf_la_LIBTOOLFLAGS = --tag=disable-static
+libgstmxf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	mxful.h \
diff --git a/gst/nsf/Makefile.am b/gst/nsf/Makefile.am
index 97038ab67..02e8ff0c4 100644
--- a/gst/nsf/Makefile.am
+++ b/gst/nsf/Makefile.am
@@ -29,7 +29,7 @@ libgstnsf_la_SOURCES = gstnsf.c $(NOSEFART_SOURCES)
 libgstnsf_la_CFLAGS = $(GST_CFLAGS) -DNSF_PLAYER
 libgstnsf_la_LIBADD = $(GST_LIBS) $(LIBM)
 libgstnsf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstnsf_la_LIBTOOLFLAGS = --tag=disable-static
+libgstnsf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstnsf.h $(NOSEFART_INCLUDES)
 
diff --git a/gst/nuvdemux/Makefile.am b/gst/nuvdemux/Makefile.am
index 35df358a2..981eb09ec 100644
--- a/gst/nuvdemux/Makefile.am
+++ b/gst/nuvdemux/Makefile.am
@@ -5,7 +5,7 @@ libgstnuvdemux_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_CFLAGS)
 libgstnuvdemux_la_LIBADD = $(GST_BASE_LIBS)
 libgstnuvdemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstnuvdemux_la_SOURCES = gstnuvdemux.c
-libgstnuvdemux_la_LIBTOOLFLAGS = --tag=disable-static
+libgstnuvdemux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstnuvdemux.h
 
diff --git a/gst/overlay/Makefile.am b/gst/overlay/Makefile.am
index 5542494bf..40230ef1d 100644
--- a/gst/overlay/Makefile.am
+++ b/gst/overlay/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = gstoverlay.h
 libgstoverlay_la_CFLAGS = $(GST_CFLAGS)
 libgstoverlay_la_LIBADD =
 libgstoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstoverlay_la_LIBTOOLFLAGS = --tag=disable-static
+libgstoverlay_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 EXTRA_DIST = 
 
diff --git a/gst/patchdetect/Makefile.am b/gst/patchdetect/Makefile.am
index 5e4452827..44ba88c0b 100644
--- a/gst/patchdetect/Makefile.am
+++ b/gst/patchdetect/Makefile.am
@@ -14,7 +14,7 @@ libgstpatchdetect_la_LIBADD = \
 	$(GST_LIBS) \
 	$(LIBM)
 libgstpatchdetect_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpatchdetect_la_LIBTOOLFLAGS = --tag=disable-static
+libgstpatchdetect_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstpatchdetect.h
 
diff --git a/gst/pcapparse/Makefile.am b/gst/pcapparse/Makefile.am
index 1c56fe869..0a2a4f899 100644
--- a/gst/pcapparse/Makefile.am
+++ b/gst/pcapparse/Makefile.am
@@ -9,7 +9,7 @@ noinst_HEADERS = \
 libgstpcapparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstpcapparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(WINSOCK2_LIBS)
 libgstpcapparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpcapparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstpcapparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/pnm/Makefile.am b/gst/pnm/Makefile.am
index 9d1542b78..5ccec7e75 100644
--- a/gst/pnm/Makefile.am
+++ b/gst/pnm/Makefile.am
@@ -4,7 +4,7 @@ libgstpnm_la_SOURCES = gstpnmutils.c gstpnm.c gstpnmdec.c gstpnmenc.c
 libgstpnm_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstpnm_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstvideo-@GST_API_VERSION@
 libgstpnm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpnm_la_LIBTOOLFLAGS = --tag=disable-static
+libgstpnm_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstpnmdec.h gstpnmutils.h gstpnmenc.h
 
diff --git a/gst/rawparse/Makefile.am b/gst/rawparse/Makefile.am
index 254f3cf52..15d28040f 100644
--- a/gst/rawparse/Makefile.am
+++ b/gst/rawparse/Makefile.am
@@ -16,7 +16,7 @@ libgstrawparse_la_LIBADD = \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstrawparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrawparse_la_LIBTOOLFLAGS = --tag=disable-static
+libgstrawparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstaudioparse.h \
diff --git a/gst/real/Makefile.am b/gst/real/Makefile.am
index 8fc414ea4..b44196a23 100644
--- a/gst/real/Makefile.am
+++ b/gst/real/Makefile.am
@@ -13,7 +13,7 @@ libgstreal_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS)
 libgstreal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstreal_la_LIBTOOLFLAGS = --tag=disable-static
+libgstreal_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = 	\
 	gstreal.h         \
diff --git a/gst/removesilence/Makefile.am b/gst/removesilence/Makefile.am
index 23e0f702a..a927e53ce 100644
--- a/gst/removesilence/Makefile.am
+++ b/gst/removesilence/Makefile.am
@@ -5,7 +5,7 @@ libgstremovesilence_la_SOURCES = gstremovesilence.c vad_private.c
 libgstremovesilence_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstremovesilence_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS)
 libgstremovesilence_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstremovesilence_la_LIBTOOLFLAGS = --tag=disable-static
+libgstremovesilence_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstremovesilence.h \
diff --git a/gst/rtjpeg/Makefile.am b/gst/rtjpeg/Makefile.am
index 76a90ba6f..d0fcdc38d 100644
--- a/gst/rtjpeg/Makefile.am
+++ b/gst/rtjpeg/Makefile.am
@@ -5,6 +5,6 @@ libgstrtjpeg_la_SOURCES = gstrtjpeg.c gstrtjpegenc.c gstrtjpegdec.c RTjpeg.c
 libgstrtjpeg_la_CFLAGS = $(GST_CFLAGS)
 libgstrtjpeg_la_LIBADD =
 libgstrtjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrtjpeg_la_LIBTOOLFLAGS = --tag=disable-static
+libgstrtjpeg_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstrtjpegenc.h gstrtjpegdec.h RTjpeg.h
diff --git a/gst/sdi/Makefile.am b/gst/sdi/Makefile.am
index eb30f17de..47897cfb8 100644
--- a/gst/sdi/Makefile.am
+++ b/gst/sdi/Makefile.am
@@ -8,7 +8,7 @@ libgstsdi_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstsdi_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) \
 		       $(GST_LIBS)
 libgstsdi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsdi_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsdi_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsdidemux.h gstsdimux.h
 
diff --git a/gst/sdp/Makefile.am b/gst/sdp/Makefile.am
index b506f284a..8c5e94c2f 100644
--- a/gst/sdp/Makefile.am
+++ b/gst/sdp/Makefile.am
@@ -7,7 +7,7 @@ libgstsdpelem_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GIO_LIBS)
 		       -lgstrtp-@GST_API_VERSION@ -lgstsdp-@GST_API_VERSION@ \
 		       $(GST_LIBS) $(WINSOCK2_LIBS)
 libgstsdpelem_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsdpelem_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsdpelem_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsdpdemux.h
 
diff --git a/gst/segmentclip/Makefile.am b/gst/segmentclip/Makefile.am
index 463b4858f..22d55a22b 100644
--- a/gst/segmentclip/Makefile.am
+++ b/gst/segmentclip/Makefile.am
@@ -5,7 +5,7 @@ libgstsegmentclip_la_SOURCES = gstsegmentclip.c gstaudiosegmentclip.c gstvideose
 libgstsegmentclip_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstsegmentclip_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) -lgstaudio-@GST_API_VERSION@
 libgstsegmentclip_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsegmentclip_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsegmentclip_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsegmentclip.h gstaudiosegmentclip.h gstvideosegmentclip.h
 
diff --git a/gst/siren/Makefile.am b/gst/siren/Makefile.am
index 21ccd04e4..dc27f7750 100644
--- a/gst/siren/Makefile.am
+++ b/gst/siren/Makefile.am
@@ -13,7 +13,7 @@ libgstsiren_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 libgstsiren_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstsiren_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsiren_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsiren_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am
index d3e430e8f..74f72313d 100644
--- a/gst/smooth/Makefile.am
+++ b/gst/smooth/Makefile.am
@@ -11,7 +11,7 @@ libgstsmooth_la_LIBADD =  \
 	$(GST_BASE_LIBS) \
 	$(GST_LIBS)
 libgstsmooth_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsmooth_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsmooth_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsmooth.h
 
diff --git a/gst/speed/Makefile.am b/gst/speed/Makefile.am
index 7c12d9e43..812a27f99 100644
--- a/gst/speed/Makefile.am
+++ b/gst/speed/Makefile.am
@@ -5,7 +5,7 @@ libgstspeed_la_SOURCES = gstspeed.c
 libgstspeed_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
 libgstspeed_la_LIBADD = $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) $(LIBM) -lgstaudio-$(GST_API_VERSION)
 libgstspeed_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstspeed_la_LIBTOOLFLAGS = --tag=disable-static
+libgstspeed_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstspeed.h
 
diff --git a/gst/stereo/Makefile.am b/gst/stereo/Makefile.am
index 22a897271..e27f6d4a3 100644
--- a/gst/stereo/Makefile.am
+++ b/gst/stereo/Makefile.am
@@ -5,7 +5,7 @@ libgststereo_la_SOURCES = gststereo.c
 libgststereo_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS)
 libgststereo_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION)
 libgststereo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgststereo_la_LIBTOOLFLAGS = --tag=disable-static
+libgststereo_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gststereo.h
 
diff --git a/gst/subenc/Makefile.am b/gst/subenc/Makefile.am
index b9e20dfe8..013b2bac6 100644
--- a/gst/subenc/Makefile.am
+++ b/gst/subenc/Makefile.am
@@ -7,7 +7,7 @@ libgstsubenc_la_SOURCES = \
 libgstsubenc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstsubenc_la_LIBADD = $(GST_BASE_LIBS)
 libgstsubenc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsubenc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstsubenc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstsrtenc.h \
diff --git a/gst/tta/Makefile.am b/gst/tta/Makefile.am
index fdc9feb99..c20414a1d 100644
--- a/gst/tta/Makefile.am
+++ b/gst/tta/Makefile.am
@@ -10,7 +10,7 @@ noinst_HEADERS = gstttaparse.h gstttadec.h \
 libgsttta_la_CFLAGS = $(GST_CFLAGS)
 libgsttta_la_LIBADD = $(GST_LIBS) $(LIBM)
 libgsttta_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttta_la_LIBTOOLFLAGS = --tag=disable-static
+libgsttta_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/vbidec/Makefile.am b/gst/vbidec/Makefile.am
index 08f08c933..804452530 100644
--- a/gst/vbidec/Makefile.am
+++ b/gst/vbidec/Makefile.am
@@ -6,5 +6,5 @@ libgstvbidec_la_SOURCES = gstvbidec.h gstvbidec.c \
 	vbiscreen.h vbiscreen.c
 libgstvbidec_la_CFLAGS = $(GST_CFLAGS)
 libgstvbidec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvbidec_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvbidec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
diff --git a/gst/videofilters/Makefile.am b/gst/videofilters/Makefile.am
index a515dd464..f2611861d 100644
--- a/gst/videofilters/Makefile.am
+++ b/gst/videofilters/Makefile.am
@@ -19,7 +19,7 @@ libgstvideofiltersbad_la_LIBADD = \
 	$(ORC_LIBS) \
 	$(LIBM)
 libgstvideofiltersbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideofiltersbad_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideofiltersbad_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
 	gstzebrastripe.h \
diff --git a/gst/videomeasure/Makefile.am b/gst/videomeasure/Makefile.am
index 8be08e5a5..d3c2f7803 100644
--- a/gst/videomeasure/Makefile.am
+++ b/gst/videomeasure/Makefile.am
@@ -15,7 +15,7 @@ libgstvideomeasure_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \
 libgstvideomeasure_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
     -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
 libgstvideomeasure_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideomeasure_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideomeasure_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/videoparsers/Makefile.am b/gst/videoparsers/Makefile.am
index 823233f50..02584ea0b 100644
--- a/gst/videoparsers/Makefile.am
+++ b/gst/videoparsers/Makefile.am
@@ -22,7 +22,7 @@ libgstvideoparsersbad_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstpbutils-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideoparsersbad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideoparsersbad_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideoparsersbad_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gsth263parse.h h263parse.h \
 	gstdiracparse.h dirac_parse.h \
diff --git a/gst/videosignal/Makefile.am b/gst/videosignal/Makefile.am
index 0968b2ed3..94086dd68 100644
--- a/gst/videosignal/Makefile.am
+++ b/gst/videosignal/Makefile.am
@@ -13,7 +13,7 @@ libgstvideosignal_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
 			    $(GST_PLUGINS_BASE_CFLAGS)
 libgstvideosignal_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvideosignal_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideosignal_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvideosignal_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/vmnc/Makefile.am b/gst/vmnc/Makefile.am
index fd3f2116f..e7f106089 100644
--- a/gst/vmnc/Makefile.am
+++ b/gst/vmnc/Makefile.am
@@ -4,7 +4,7 @@ libgstvmnc_la_SOURCES = vmncdec.c
 libgstvmnc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstvmnc_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstvmnc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvmnc_la_LIBTOOLFLAGS = --tag=disable-static
+libgstvmnc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 Android.mk: Makefile.am $(BUILT_SOURCES)
 	androgenizer \
diff --git a/gst/y4m/Makefile.am b/gst/y4m/Makefile.am
index eb4d5059c..3913fc5e3 100644
--- a/gst/y4m/Makefile.am
+++ b/gst/y4m/Makefile.am
@@ -7,7 +7,7 @@ libgsty4mdec_la_LIBADD = \
 	$(GST_PLUGINS_BASE_LIBS) -lgstvideo-@GST_API_VERSION@ \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgsty4mdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsty4mdec_la_LIBTOOLFLAGS = --tag=disable-static
+libgsty4mdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gsty4mdec.h
 
diff --git a/gst/yadif/Makefile.am b/gst/yadif/Makefile.am
index 08eee4ad3..31417b9d4 100644
--- a/gst/yadif/Makefile.am
+++ b/gst/yadif/Makefile.am
@@ -6,7 +6,7 @@ libgstyadif_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
 libgstyadif_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-1.0 \
 	$(GST_BASE_LIBS) $(GST_LIBS)
 libgstyadif_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstyadif_la_LIBTOOLFLAGS = --tag=disable-static
+libgstyadif_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 
 EXTRA_DIST = yadif_template.c