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/configure.ac b/configure.ac
index 497b48e..a45311e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -401,28 +401,6 @@ AG_GST_SET_PACKAGE_RELEASE_DATETIME_WITH_NANO([$PACKAGE_VERSION_NANO],
   ["${srcdir}/gst-plugins-base.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 If only building static libraries, define GST_STATIC_COMPILATION. This is
 dnl needed only on Windows, but it doesn't hurt to have it everywhere.
 if test x$enable_static = xyes -a x$enable_shared = xno; then

diff --git a/ext/alsa/Makefile.am b/ext/alsa/Makefile.am
index 7f885c5..c942a52 100644 (file)
--- a/ext/alsa/Makefile.am
+++ b/ext/alsa/Makefile.am
@@ -19,7 +19,6 @@ libgstalsa_la_LIBADD = \
        $(ALSA_LIBS)
 
 libgstalsa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstalsa_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstalsa.h \

diff --git a/ext/cdparanoia/Makefile.am b/ext/cdparanoia/Makefile.am
index 86c3842..81b1904 100644 (file)
--- a/ext/cdparanoia/Makefile.am
+++ b/ext/cdparanoia/Makefile.am
@@ -12,6 +12,5 @@ libgstcdparanoia_la_LIBADD = \
        $(GST_LIBS) \
        $(CDPARANOIA_LIBS)
 libgstcdparanoia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcdparanoia_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstcdparanoiasrc.h

diff --git a/ext/libvisual/Makefile.am b/ext/libvisual/Makefile.am
index 73d1e20..40e23ea 100644 (file)
--- a/ext/libvisual/Makefile.am
+++ b/ext/libvisual/Makefile.am
@@ -8,6 +8,5 @@ libgstlibvisual_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$(GST_API_VERSION).la \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBVISUAL_LIBS)
 libgstlibvisual_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstlibvisual_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = visual.h

diff --git a/ext/ogg/Makefile.am b/ext/ogg/Makefile.am
index 05d9063..f7938f5 100644 (file)
--- a/ext/ogg/Makefile.am
+++ b/ext/ogg/Makefile.am
@@ -35,4 +35,3 @@ libgstogg_la_LIBADD = \
        $(GST_LIBS) \
        $(OGG_LIBS)
 libgstogg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstogg_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)

diff --git a/ext/opus/Makefile.am b/ext/opus/Makefile.am
index 27ae39d..517bc41 100644 (file)
--- a/ext/opus/Makefile.am
+++ b/ext/opus/Makefile.am
@@ -15,6 +15,5 @@ libgstopus_la_LIBADD = \
        $(GST_LIBS) \
        $(OPUS_LIBS)
 libgstopus_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(LIBM)
-libgstopus_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstopusenc.h gstopusdec.h gstopusheader.h gstopuscommon.h

diff --git a/ext/pango/Makefile.am b/ext/pango/Makefile.am
index 9320e9e..de7bf97 100644 (file)
--- a/ext/pango/Makefile.am
+++ b/ext/pango/Makefile.am
@@ -26,5 +26,4 @@ libgstpango_la_LIBADD = \
        $(LIBM) \
        $(PANGO_LIBS)
 libgstpango_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpango_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 

diff --git a/ext/theora/Makefile.am b/ext/theora/Makefile.am
index b1202a8..900c5a9 100644 (file)
--- a/ext/theora/Makefile.am
+++ b/ext/theora/Makefile.am
@@ -17,5 +17,4 @@ libgsttheora_la_LIBADD = \
        $(GST_LIBS) \
        $(THEORA_LIBS)
 libgsttheora_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgsttheora_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 

diff --git a/ext/vorbis/Makefile.am b/ext/vorbis/Makefile.am
index cc3d28e..daf843d 100644 (file)
--- a/ext/vorbis/Makefile.am
+++ b/ext/vorbis/Makefile.am
@@ -20,7 +20,6 @@ libgstvorbis_la_LIBADD = \
        $(GST_LIBS) \
        $(VORBIS_LIBS) $(VORBISENC_LIBS)
 libgstvorbis_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvorbis_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 endif
 
 if USE_IVORBIS
@@ -36,7 +35,6 @@ libgstivorbisdec_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
        $(GST_LIBS) $(IVORBIS_LIBS)
 libgstivorbisdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstivorbisdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 endif
 
 noinst_HEADERS = gstvorbisenc.h \

diff --git a/gst/adder/Makefile.am b/gst/adder/Makefile.am
index 3ba6523..95a97cd 100644 (file)
--- a/gst/adder/Makefile.am
+++ b/gst/adder/Makefile.am
@@ -11,6 +11,5 @@ libgstadder_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstadder_la_LIBADD =  \
                 $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
                 $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS)
-libgstadder_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstadder.h

diff --git a/gst/app/Makefile.am b/gst/app/Makefile.am
index bdd761a..539ffad 100644 (file)
--- a/gst/app/Makefile.am
+++ b/gst/app/Makefile.am
@@ -4,4 +4,3 @@ libgstapp_la_SOURCES = gstapp.c
 libgstapp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstapp_la_LIBADD = $(top_builddir)/gst-libs/gst/app/libgstapp-@GST_API_VERSION@.la $(GST_BASE_LIBS)
 libgstapp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstapp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)

diff --git a/gst/audioconvert/Makefile.am b/gst/audioconvert/Makefile.am
index baca314..0a7ac76 100644 (file)
--- a/gst/audioconvert/Makefile.am
+++ b/gst/audioconvert/Makefile.am
@@ -9,7 +9,6 @@ libgstaudioconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudioconvert_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
-libgstaudioconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstaudioconvert.h \

diff --git a/gst/audiorate/Makefile.am b/gst/audiorate/Makefile.am
index 2b0697c..981570a 100644 (file)
--- a/gst/audiorate/Makefile.am
+++ b/gst/audiorate/Makefile.am
@@ -7,5 +7,3 @@ libgstaudiorate_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libgstaudiorate_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiorate_la_LIBADD = $(GST_LIBS) \
         $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la
-
-libgstaudiorate_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)

diff --git a/gst/audioresample/Makefile.am b/gst/audioresample/Makefile.am
index 6d83a39..2df7221 100644 (file)
--- a/gst/audioresample/Makefile.am
+++ b/gst/audioresample/Makefile.am
@@ -17,7 +17,6 @@ libgstaudioresample_la_LIBADD = \
        $(LIBM)
 
 libgstaudioresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstaudioresample_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstaudioresample.h

diff --git a/gst/audiotestsrc/Makefile.am b/gst/audiotestsrc/Makefile.am
index 027d2b7..e6c013f 100644 (file)
--- a/gst/audiotestsrc/Makefile.am
+++ b/gst/audiotestsrc/Makefile.am
@@ -6,6 +6,5 @@ libgstaudiotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstaudiotestsrc_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
-libgstaudiotestsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstaudiotestsrc.h

diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am
index 3209d3c..9479b69 100644 (file)
--- a/gst/encoding/Makefile.am
+++ b/gst/encoding/Makefile.am
@@ -11,7 +11,6 @@ libgstencoding_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstencoding_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \
        $(GST_LIBS)
-libgstencoding_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS =               \
        gstencodebin.h          \

diff --git a/gst/gio/Makefile.am b/gst/gio/Makefile.am
index 111dfb1..847704d 100644 (file)
--- a/gst/gio/Makefile.am
+++ b/gst/gio/Makefile.am
@@ -15,7 +15,6 @@ libgstgio_la_SOURCES = \
 libgstgio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgstgio_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
 libgstgio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GIO_LDFLAGS)
-libgstgio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # headers we need but don't want installed
 noinst_HEADERS = \

diff --git a/gst/pbtypes/Makefile.am b/gst/pbtypes/Makefile.am
index bc735eb..fd6ef3f 100644 (file)
--- a/gst/pbtypes/Makefile.am
+++ b/gst/pbtypes/Makefile.am
@@ -8,5 +8,3 @@ libgstpbtypes_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstpbtypes_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
        $(GST_BASE_LIBS) $(GST_LIBS)
-
-libgstpbtypes_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)

diff --git a/gst/playback/Makefile.am b/gst/playback/Makefile.am
index 9603dab..ec6d622 100644 (file)
--- a/gst/playback/Makefile.am
+++ b/gst/playback/Makefile.am
@@ -28,7 +28,6 @@ libgstplayback_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-@GST_API_VERSION@.la \
        $(GST_LIBS)
-libgstplayback_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 # FIXME: gstdecodebin3-parse.c isn't really a header,
 # but for now it's included into gstdecodebin3.c directly

diff --git a/gst/rawparse/Makefile.am b/gst/rawparse/Makefile.am
index ed8dbe4..a80fa7a 100644 (file)
--- a/gst/rawparse/Makefile.am
+++ b/gst/rawparse/Makefile.am
@@ -18,7 +18,6 @@ libgstrawparse_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
 libgstrawparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstrawparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        unalignedaudio.h \

diff --git a/gst/subparse/Makefile.am b/gst/subparse/Makefile.am
index 7f89447..32a0ec5 100644 (file)
--- a/gst/subparse/Makefile.am
+++ b/gst/subparse/Makefile.am
@@ -18,7 +18,6 @@ libgstsubparse_la_SOURCES = \
 libgstsubparse_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS)
 libgstsubparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstsubparse_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS)
-libgstsubparse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstssaparse.h \

diff --git a/gst/tcp/Makefile.am b/gst/tcp/Makefile.am
index 1ff06a3..d9b553c 100644 (file)
--- a/gst/tcp/Makefile.am
+++ b/gst/tcp/Makefile.am
@@ -19,7 +19,6 @@ libgsttcp_la_SOURCES = \
 libgsttcp_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_NET_CFLAGS) $(GST_CFLAGS) $(GIO_CFLAGS)
 libgsttcp_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttcp_la_LIBADD = $(GST_BASE_LIBS) $(GST_NET_LIBS) $(GST_LIBS) $(GIO_LIBS)
-libgsttcp_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
   gstsocketsrc.h \

diff --git a/gst/typefind/Makefile.am b/gst/typefind/Makefile.am
index 3213c40..04096b5 100644 (file)
--- a/gst/typefind/Makefile.am
+++ b/gst/typefind/Makefile.am
@@ -8,5 +8,3 @@ libgsttypefindfunctions_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgsttypefindfunctions_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \
        $(GST_BASE_LIBS) $(GST_LIBS) $(GIO_LIBS)
-
-libgsttypefindfunctions_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)

diff --git a/gst/videoconvert/Makefile.am b/gst/videoconvert/Makefile.am
index 67b5625..7bbfe7f 100644 (file)
--- a/gst/videoconvert/Makefile.am
+++ b/gst/videoconvert/Makefile.am
@@ -11,6 +11,5 @@ libgstvideoconvert_la_LIBADD = \
        $(GST_LIBS) \
        $(LIBM)
 libgstvideoconvert_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstvideoconvert_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideoconvert.h

diff --git a/gst/videorate/Makefile.am b/gst/videorate/Makefile.am
index e107924..06a764b 100644 (file)
--- a/gst/videorate/Makefile.am
+++ b/gst/videorate/Makefile.am
@@ -9,4 +9,3 @@ libgstvideorate_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \
        $(GST_BASE_LIBS) \
        $(GST_LIBS)
-libgstvideorate_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)

diff --git a/gst/videoscale/Makefile.am b/gst/videoscale/Makefile.am
index 9462611..469882f 100644 (file)
--- a/gst/videoscale/Makefile.am
+++ b/gst/videoscale/Makefile.am
@@ -7,7 +7,6 @@ libgstvideoscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideoscale_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \
        $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM)
-libgstvideoscale_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
        gstvideoscale.h

diff --git a/gst/videotestsrc/Makefile.am b/gst/videotestsrc/Makefile.am
index 6c37d1c..8ede272 100644 (file)
--- a/gst/videotestsrc/Makefile.am
+++ b/gst/videotestsrc/Makefile.am
@@ -13,7 +13,6 @@ libgstvideotestsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstvideotestsrc_la_LIBADD =         \
        $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la \
        $(GST_BASE_LIBS) $(GST_LIBS) $(ORC_LIBS) $(LIBM)
-libgstvideotestsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvideotestsrc.h videotestsrc.h
 

diff --git a/gst/volume/Makefile.am b/gst/volume/Makefile.am
index e1dd738..3eecbf0 100644 (file)
--- a/gst/volume/Makefile.am
+++ b/gst/volume/Makefile.am
@@ -12,6 +12,5 @@ libgstvolume_la_LIBADD = \
        $(GST_BASE_LIBS) \
        $(GST_LIBS) \
        $(ORC_LIBS)
-libgstvolume_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstvolume.h

diff --git a/sys/ximage/Makefile.am b/sys/ximage/Makefile.am
index 5d113f9..16d4ec4 100644 (file)
--- a/sys/ximage/Makefile.am
+++ b/sys/ximage/Makefile.am
@@ -8,6 +8,5 @@ libgstximagesink_la_LIBADD = \
        $(X_LIBS) $(XSHM_LIBS)
 libgstximagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstximagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la
-libgstximagesink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = ximagesink.h ximagepool.h

diff --git a/sys/xvimage/Makefile.am b/sys/xvimage/Makefile.am
index 4cf454a..6ccc39e 100644 (file)
--- a/sys/xvimage/Makefile.am
+++ b/sys/xvimage/Makefile.am
@@ -9,6 +9,5 @@ libgstxvimagesink_la_LIBADD = \
        $(X_LIBS) $(XVIDEO_LIBS) $(XSHM_LIBS) $(LIBM)
 libgstxvimagesink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libgstxvimagesink_la_DEPENDENCIES = $(top_builddir)/gst-libs/gst/video/libgstvideo-$(GST_API_VERSION).la
-libgstxvimagesink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = xvimagesink.h xvimagepool.h xvimageallocator.h xvcontext.h