Remove plugin specific static build option

Static and dynamic plugins now have the same interface. The standard
--enable-static/--enable-shared toggle are sufficient.

diff --git a/config.h.meson b/config.h.meson
index 4e4ece7fba0e10438533daf60f1f720534b8ebc9..e036604741f8ccda5578c3b5f97da65ca910ea79 100644 (file)
--- a/config.h.meson
+++ b/config.h.meson
@@ -58,9 +58,6 @@
 /* GStreamer package release date/time for plugins as YYYY-MM-DD */
 #mesondefine GST_PACKAGE_RELEASE_DATETIME
 
-/* Define if static plugins should be built */
-#mesondefine GST_PLUGIN_BUILD_STATIC
-
 /* Define to enable a52dec (used by a52dec). */
 #mesondefine HAVE_A52DEC
 

diff --git a/configure.ac b/configure.ac
index e8a0a6c988d4a3c6c949c8d81d72a31c397828f7..e92ddae3f83188ab92a002cd1d0a646a3cf5fab1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -201,28 +201,6 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
   ["${srcdir}/gst-plugins-ugly.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")
-
 dnl define an ERROR_CFLAGS Makefile variable
 AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [
     -Wmissing-declarations -Wmissing-prototypes -Wredundant-decls

diff --git a/ext/a52dec/Makefile.am b/ext/a52dec/Makefile.am
index 6a43121e9a999022d4acc5d8051b6630255b8563..5a64f663c33f9200251bb15324a4aaaa4903e5ed 100644 (file)
--- a/ext/a52dec/Makefile.am
+++ b/ext/a52dec/Makefile.am
@@ -15,6 +15,5 @@ libgsta52dec_la_LIBADD = \
        $(ORC_LIBS) \
        $(A52DEC_LIBS)
 libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsta52dec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gsta52dec.h

diff --git a/ext/amrnb/Makefile.am b/ext/amrnb/Makefile.am
index 283f54d0e91da9dfbf8a340ccaf0184e9cf07c25..7819b7442d6d6706cb32d989c8d4c4319904a050 100644 (file)
--- a/ext/amrnb/Makefile.am
+++ b/ext/amrnb/Makefile.am
@@ -11,7 +11,6 @@ libgstamrnb_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
         -lgstaudio-@GST_API_VERSION@ \
         $(GST_BASE_LIBS) $(GST_LIBS) $(AMRNB_LIBS)
 libgstamrnb_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstamrnb_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        amrnbdec.h \

diff --git a/ext/amrwbdec/Makefile.am b/ext/amrwbdec/Makefile.am
index aef298464db5cd238bcda33e82b8abcf3edc9e76..8fa3acfb3e3c7cd6eb495d46c81c272c301184a8 100644 (file)
--- a/ext/amrwbdec/Makefile.am
+++ b/ext/amrwbdec/Makefile.am
@@ -11,7 +11,6 @@ libgstamrwbdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        -lgstaudio-@GST_API_VERSION@ \
        $(GST_LIBS) $(AMRWB_LIBS)
 libgstamrwbdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstamrwbdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        amrwbdec.h

diff --git a/ext/cdio/Makefile.am b/ext/cdio/Makefile.am
index bd8f422294d74157bc3f90a3b7af6d04aa22b5fa..34f707ec8cb4bc6afb5d976bf4338a06557d7e3e 100644 (file)
--- a/ext/cdio/Makefile.am
+++ b/ext/cdio/Makefile.am
@@ -16,7 +16,6 @@ libgstcdio_la_LIBADD = \
        $(CDIO_LIBS)
 
 libgstcdio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) 
-libgstcdio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstcdio.h \

diff --git a/ext/dvdread/Makefile.am b/ext/dvdread/Makefile.am
index 30b4ba35069802cfe26c9ef6dcfa6f6d61930b9c..e7ea258ad9898afea5c05a1951c42b9e5998e58c 100644 (file)
--- a/ext/dvdread/Makefile.am
+++ b/ext/dvdread/Makefile.am
@@ -5,7 +5,6 @@ libgstdvdread_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(DVDREAD_CFLAGS)
 libgstdvdread_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) \
        $(GMODULE_NO_EXPORT_LIBS) $(DVDREAD_LIBS)
 libgstdvdread_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdread_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = dvdreadsrc.h
 

diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am
index c7124dd107f71d50cddc7bcf2fe9a89bae8ef70b..5e5b3a02debbf7aacfe801ab778de18e5a4c4cb2 100644 (file)
--- a/ext/lame/Makefile.am
+++ b/ext/lame/Makefile.am
@@ -6,6 +6,5 @@ libgstlame_la_CFLAGS = \
 libgstlame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LAME_LIBS)
 libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstlame_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstlamemp3enc.h

diff --git a/ext/mpeg2dec/Makefile.am b/ext/mpeg2dec/Makefile.am
index 593e2c3fa1c2e263e1a5f2ba857faa60f803b054..892bf592ad3360efd656321b44c5d9467fc5abb6 100644 (file)
--- a/ext/mpeg2dec/Makefile.am
+++ b/ext/mpeg2dec/Makefile.am
@@ -6,6 +6,5 @@ libgstmpeg2dec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 libgstmpeg2dec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_LIBS) $(MPEG2DEC_LIBS)
 libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpeg2dec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstmpeg2dec.h

diff --git a/ext/mpg123/Makefile.am b/ext/mpg123/Makefile.am
index 6c96207c865f89ef41dae6d4e6627ca02b6ea95a..465f325973ce0375b920720cc57844323e536938 100644 (file)
--- a/ext/mpg123/Makefile.am
+++ b/ext/mpg123/Makefile.am
@@ -7,6 +7,5 @@ libgstmpg123_la_CFLAGS = -DGST_USE_UNSTABLE_API \
 libgstmpg123_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ \
        $(GST_BASE_LIBS) $(GST_LIBS) $(MPG123_LIBS)
 libgstmpg123_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstmpg123_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstmpg123audiodec.h

diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am
index d44b227f36f6e0f95d17b8c3203266b954e1f5bf..aab0bd4d9cdc7ff54d6d047be6728779836e95b7 100644 (file)
--- a/ext/sidplay/Makefile.am
+++ b/ext/sidplay/Makefile.am
@@ -6,6 +6,5 @@ libgstsid_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
 libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(SIDPLAY_LIBS) \
                      -lgstaudio-$(GST_API_VERSION)
 libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsid_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstsiddec.h

diff --git a/ext/twolame/Makefile.am b/ext/twolame/Makefile.am
index b6de82c174e2182de9b8d03901dabe5c7aad1aa5..362ee20f65b249e7cfa25f2a77073f0161a71a38 100644 (file)
--- a/ext/twolame/Makefile.am
+++ b/ext/twolame/Makefile.am
@@ -7,6 +7,5 @@ libgsttwolame_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        -lgstaudio-@GST_API_VERSION@ -lgstpbutils-@GST_API_VERSION@ \
        $(GST_LIBS) $(TWOLAME_LIBS)
 libgsttwolame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttwolame_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gsttwolamemp2enc.h

diff --git a/ext/x264/Makefile.am b/ext/x264/Makefile.am
index 0866d642e90f3319dcd05b4df46029e6847de373..d2287ebad1551da44dcb53c30b88da564fea4330 100644 (file)
--- a/ext/x264/Makefile.am
+++ b/ext/x264/Makefile.am
@@ -13,7 +13,6 @@ libgstx264_la_LIBADD = \
        $(X264_LIBS) \
        $(GMODULE_NO_EXPORT_LIBS)
 libgstx264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstx264_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstx264enc.h
 

diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am
index ede3532a49bbf5097c84e8018ceba5e46f008c48..dcc7b2749c08782c73437de21f11e331a9a1d274 100644 (file)
--- a/gst/asfdemux/Makefile.am
+++ b/gst/asfdemux/Makefile.am
@@ -9,6 +9,5 @@ libgstasf_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                $(GST_BASE_LIBS) $(GST_LIBS) \
                $(WIN32_LIBS)
 libgstasf_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstasf_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtspwms.h

diff --git a/gst/dvdlpcmdec/Makefile.am b/gst/dvdlpcmdec/Makefile.am
index 6fb937136d6da86c19d1f17deb61a7c26c59fce5..ee91b17f43356577274db9f3b2feaf3055f91d22 100644 (file)
--- a/gst/dvdlpcmdec/Makefile.am
+++ b/gst/dvdlpcmdec/Makefile.am
@@ -5,6 +5,5 @@ libgstdvdlpcmdec_la_SOURCES = gstdvdlpcmdec.c
 libgstdvdlpcmdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstdvdlpcmdec_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-@GST_API_VERSION@ $(GST_BASE_LIBS) $(GST_LIBS)
 libgstdvdlpcmdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdlpcmdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdvdlpcmdec.h

diff --git a/gst/dvdsub/Makefile.am b/gst/dvdsub/Makefile.am
index 5f0358707755f7e7743c096c4c301a70ae5009ce..31f71d2917e262f23c5e47ef4176685efe7dff3d 100644 (file)
--- a/gst/dvdsub/Makefile.am
+++ b/gst/dvdsub/Makefile.am
@@ -6,6 +6,5 @@ libgstdvdsub_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) \
 libgstdvdsub_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 libgstdvdsub_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstdvdsub_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstdvdsubdec.h gstdvdsubparse.h

diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am
index 654a3d6411ae66ce71c39c822b38d84a07ed91f3..f77522d844ffe0626933277c6fef685f0e2fbda1 100644 (file)
--- a/gst/realmedia/Makefile.am
+++ b/gst/realmedia/Makefile.am
@@ -14,7 +14,6 @@ libgstrealmedia_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
                                -lgstpbutils-@GST_API_VERSION@ \
                                $(GST_BASE_LIBS) $(GST_LIBS)
 libgstrealmedia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrealmedia_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = rademux.h rmdemux.h rmutils.h rdtdepay.h rdtmanager.h \
                 rdtjitterbuffer.h rtspreal.h realhash.h asmrules.h gstrdtbuffer.h \

diff --git a/gst/xingmux/Makefile.am b/gst/xingmux/Makefile.am
index 0190890c8a72a10bc737e34cbe4f5620d2c5ec06..15310007786942cbb244aa87b38fd23a497774aa 100644 (file)
--- a/gst/xingmux/Makefile.am
+++ b/gst/xingmux/Makefile.am
@@ -6,6 +6,5 @@ libgstxingmux_la_SOURCES = plugin.c gstxingmux.c
 libgstxingmux_la_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstxingmux_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstxingmux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstxingmux_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstxingmux.h