mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-03 13:02:29 +00:00
Remove plugin specific static build option
Static and dynamic plugins now have the same interface. The standard --enable-static/--enable-shared toggle are sufficient.
This commit is contained in:
parent
2bf0a98bcd
commit
d143af2c77
5 changed files with 1 additions and 28 deletions
|
@ -61,9 +61,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
|
||||
|
||||
/* location of the installed gst-plugin-scanner */
|
||||
#mesondefine GST_PLUGIN_SCANNER_INSTALLED
|
||||
|
||||
|
|
22
configure.ac
22
configure.ac
|
@ -170,28 +170,6 @@ AC_SUBST([BASH_COMPLETION_DIR])
|
|||
AC_SUBST([BASH_HELPERS_DIR])
|
||||
AM_CONDITIONAL([ENABLE_BASH_COMPLETION],[test "x$with_bash_completion_dir" != "xno"])
|
||||
|
||||
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
|
||||
|
|
|
@ -33,7 +33,6 @@ libgstcoreelements_la_LIBADD = \
|
|||
$(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
|
||||
$(GST_OBJ_LIBS)
|
||||
libgstcoreelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgstcoreelements_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
||||
|
||||
noinst_HEADERS = \
|
||||
gstcapsfilter.h \
|
||||
|
|
|
@ -28,7 +28,7 @@ gst_elements_sources = [
|
|||
if libtype != 'shared'
|
||||
gst_elements_static = static_library('gstcoreelements',
|
||||
gst_elements_sources,
|
||||
c_args : gst_c_args + ['-DGST_PLUGIN_BUILD_STATIC'],
|
||||
c_args : gst_c_args,
|
||||
include_directories : [configinc],
|
||||
dependencies : [gobject_dep, glib_dep, gst_dep, gst_base_dep],
|
||||
install : true,
|
||||
|
|
|
@ -30,7 +30,6 @@ libgstcoretracers_la_LIBADD = \
|
|||
$(GST_PRINTF_LA) \
|
||||
$(GST_OBJ_LIBS)
|
||||
libgstcoretracers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||
libgstcoretracers_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
||||
|
||||
noinst_HEADERS = \
|
||||
gstlatency.h \
|
||||
|
|
Loading…
Reference in a new issue