From d02e7d8029b0d852f2bc29bc956da70b239867e8 Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Tue, 16 May 2017 14:07:56 -0400 Subject: [PATCH] Remove plugin specific static build option Static and dynamic plugins now have the same interface. The standard --enable-static/--enable-shared toggle are sufficient. --- config.h.meson | 3 --- configure.ac | 22 ---------------------- ext/a52dec/Makefile.am | 1 - ext/amrnb/Makefile.am | 1 - ext/amrwbdec/Makefile.am | 1 - ext/cdio/Makefile.am | 1 - ext/dvdread/Makefile.am | 1 - ext/lame/Makefile.am | 1 - ext/mpeg2dec/Makefile.am | 1 - ext/mpg123/Makefile.am | 1 - ext/sidplay/Makefile.am | 1 - ext/twolame/Makefile.am | 1 - ext/x264/Makefile.am | 1 - gst/asfdemux/Makefile.am | 1 - gst/dvdlpcmdec/Makefile.am | 1 - gst/dvdsub/Makefile.am | 1 - gst/realmedia/Makefile.am | 1 - gst/xingmux/Makefile.am | 1 - 18 files changed, 41 deletions(-) diff --git a/config.h.meson b/config.h.meson index 4e4ece7..e036604 100644 --- 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 e8a0a6c..e92ddae 100644 --- 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 6a43121..5a64f66 100644 --- 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 283f54d..7819b74 100644 --- 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 aef2984..8fa3acf 100644 --- 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 bd8f422..34f707e 100644 --- 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 30b4ba3..e7ea258 100644 --- 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 c7124dd..5e5b3a0 100644 --- 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 593e2c3..892bf59 100644 --- 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 6c96207..465f325 100644 --- 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 d44b227..aab0bd4 100644 --- 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 b6de82c..362ee20 100644 --- 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 0866d64..d2287eb 100644 --- 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 ede3532..dcc7b27 100644 --- 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 6fb9371..ee91b17 100644 --- 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 5f03587..31f71d2 100644 --- 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 654a3d6..f77522d 100644 --- 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 0190890..1531000 100644 --- 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 -- 2.7.4