mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-24 16:18:16 +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
15a17f3f8d
commit
a65562fe9c
3 changed files with 3 additions and 23 deletions
24
configure.ac
24
configure.ac
|
@ -152,27 +152,9 @@ dnl *** set variables based on configure arguments ***
|
||||||
dnl set location of plugin directory
|
dnl set location of plugin directory
|
||||||
AG_GST_SET_PLUGINDIR
|
AG_GST_SET_PLUGINDIR
|
||||||
|
|
||||||
dnl build static plugins or not
|
dnl Detect if we are building static plugins, in which case we need to
|
||||||
AC_MSG_CHECKING([whether to build static plugins or not])
|
dnl generates libav .la files and install the static libraries.
|
||||||
AC_ARG_ENABLE(
|
AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static" = "xyes")
|
||||||
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
|
dnl define an ERROR_CFLAGS Makefile variable
|
||||||
AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [
|
AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [
|
||||||
|
|
|
@ -18,7 +18,6 @@ libgstlibav_la_SOURCES = gstav.c \
|
||||||
# gstavscale.c
|
# gstavscale.c
|
||||||
|
|
||||||
libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
||||||
libgstlibav_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
|
||||||
libgstlibav_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
|
libgstlibav_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
|
||||||
-lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
|
-lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
|
||||||
-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
|
-lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \
|
||||||
|
|
|
@ -8,7 +8,6 @@ libgstavscale_la_LIBADD = $(SWSCALE_LIBS) \
|
||||||
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
|
$(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
|
||||||
$(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz
|
$(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz
|
||||||
libgstavscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
|
libgstavscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
|
||||||
libgstavscale_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
|
|
||||||
|
|
||||||
if HAVE_LIBAV_UNINSTALLED
|
if HAVE_LIBAV_UNINSTALLED
|
||||||
libgstavscale_la_DEPENDENCIES = $(SWSCALE_DEPS)
|
libgstavscale_la_DEPENDENCIES = $(SWSCALE_DEPS)
|
||||||
|
|
Loading…
Reference in a new issue