mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-25 17:50:36 +00:00
Drop tedious LIBVA_EXTRA_{CFLAGS,LIBS} definitions in Makefile.am. Override CFLAGS & LIBS instead.
This commit is contained in:
parent
725bc7a607
commit
1727295d2c
5 changed files with 2 additions and 10 deletions
|
@ -181,6 +181,8 @@ PKG_CHECK_MODULES(LIBVA_X11, [$LIBVA_X11_PKGNAME],
|
||||||
if test "$ac_cv_have_vaapi_x11" = "no"; then
|
if test "$ac_cv_have_vaapi_x11" = "no"; then
|
||||||
if test "$ac_cv_have_vaapi_old" = "yes"; then
|
if test "$ac_cv_have_vaapi_old" = "yes"; then
|
||||||
LIBVA_X11_PKGNAME="libva"
|
LIBVA_X11_PKGNAME="libva"
|
||||||
|
CFLAGS="$CFLAGS $LIBVA_EXTRA_CFLAGS"
|
||||||
|
LIBS="$LIBS $LIBVA_EXTRA_LIBS"
|
||||||
else
|
else
|
||||||
AC_MSG_ERROR([could not find VA-API])
|
AC_MSG_ERROR([could not find VA-API])
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -84,14 +84,12 @@ libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS = \
|
||||||
$(GST_BASE_CFLAGS) \
|
$(GST_BASE_CFLAGS) \
|
||||||
$(GST_CFLAGS) \
|
$(GST_CFLAGS) \
|
||||||
$(LIBVA_CFLAGS) \
|
$(LIBVA_CFLAGS) \
|
||||||
$(LIBVA_EXTRA_CFLAGS) \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
libgstvaapi_@GST_MAJORMINOR@_la_LIBADD = \
|
libgstvaapi_@GST_MAJORMINOR@_la_LIBADD = \
|
||||||
$(GST_BASE_LIBS) \
|
$(GST_BASE_LIBS) \
|
||||||
$(GST_LIBS) \
|
$(GST_LIBS) \
|
||||||
$(LIBVA_LIBS) \
|
$(LIBVA_LIBS) \
|
||||||
$(LIBVA_EXTRA_LIBS) \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
libgstvaapi_x11_@GST_MAJORMINOR@_la_SOURCES = \
|
libgstvaapi_x11_@GST_MAJORMINOR@_la_SOURCES = \
|
||||||
|
@ -111,13 +109,11 @@ libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS = \
|
||||||
$(GLIB_CFLAGS) \
|
$(GLIB_CFLAGS) \
|
||||||
$(GST_BASE_CFLAGS) \
|
$(GST_BASE_CFLAGS) \
|
||||||
$(LIBVA_X11_CFLAGS) \
|
$(LIBVA_X11_CFLAGS) \
|
||||||
$(LIBVA_EXTRA_CFLAGS) \
|
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD = \
|
libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD = \
|
||||||
$(GLIB_LIBS) \
|
$(GLIB_LIBS) \
|
||||||
$(LIBVA_X11_LIBS) \
|
$(LIBVA_X11_LIBS) \
|
||||||
$(LIBVA_EXTRA_LIBS) \
|
|
||||||
libgstvaapi-@GST_MAJORMINOR@.la \
|
libgstvaapi-@GST_MAJORMINOR@.la \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
plugin_LTLIBRARIES = libgstvaapiconvert.la
|
plugin_LTLIBRARIES = libgstvaapiconvert.la
|
||||||
|
|
||||||
libgstvaapi_CFLAGS = \
|
libgstvaapi_CFLAGS = \
|
||||||
$(LIBVA_EXTRA_CFLAGS) \
|
|
||||||
-I$(top_srcdir)/gst-libs
|
-I$(top_srcdir)/gst-libs
|
||||||
|
|
||||||
libgstvaapi_LIBS = \
|
libgstvaapi_LIBS = \
|
||||||
$(LIBVA_EXTRA_LIBS) \
|
|
||||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la
|
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la
|
||||||
|
|
||||||
libgstvaapiconvert_la_SOURCES = \
|
libgstvaapiconvert_la_SOURCES = \
|
||||||
|
|
|
@ -1,11 +1,9 @@
|
||||||
plugin_LTLIBRARIES = libgstvaapisink.la
|
plugin_LTLIBRARIES = libgstvaapisink.la
|
||||||
|
|
||||||
libgstvaapi_CFLAGS = \
|
libgstvaapi_CFLAGS = \
|
||||||
$(LIBVA_EXTRA_CFLAGS) \
|
|
||||||
-I$(top_srcdir)/gst-libs
|
-I$(top_srcdir)/gst-libs
|
||||||
|
|
||||||
libgstvaapi_LIBS = \
|
libgstvaapi_LIBS = \
|
||||||
$(LIBVA_EXTRA_LIBS) \
|
|
||||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la
|
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la
|
||||||
|
|
||||||
libgstvaapisink_la_SOURCES = \
|
libgstvaapisink_la_SOURCES = \
|
||||||
|
|
|
@ -5,13 +5,11 @@ noinst_PROGRAMS = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
TEST_CFLAGS = \
|
TEST_CFLAGS = \
|
||||||
$(LIBVA_EXTRA_CFLAGS) \
|
|
||||||
$(GST_CFLAGS) \
|
$(GST_CFLAGS) \
|
||||||
-I$(top_srcdir)/gst-libs \
|
-I$(top_srcdir)/gst-libs \
|
||||||
$(X11_CFLAGS)
|
$(X11_CFLAGS)
|
||||||
|
|
||||||
TEST_LIBS = \
|
TEST_LIBS = \
|
||||||
$(LIBVA_EXTRA_LIBS) \
|
|
||||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la \
|
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la \
|
||||||
$(X11_LIBS)
|
$(X11_LIBS)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue