Drop tedious LIBVA_EXTRA_{CFLAGS,LIBS} definitions in Makefile.am. Override CFLAGS...

diff --git a/configure.ac b/configure.ac
index cc996a6..55fd58c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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_old" = "yes"; then
         LIBVA_X11_PKGNAME="libva"
+        CFLAGS="$CFLAGS $LIBVA_EXTRA_CFLAGS"
+        LIBS="$LIBS $LIBVA_EXTRA_LIBS"
     else
         AC_MSG_ERROR([could not find VA-API])
     fi

diff --git a/gst-libs/gst/vaapi/Makefile.am b/gst-libs/gst/vaapi/Makefile.am
index d3299f5..f8d7203 100644 (file)
--- a/gst-libs/gst/vaapi/Makefile.am
+++ b/gst-libs/gst/vaapi/Makefile.am
@@ -84,14 +84,12 @@ libgstvaapi_@GST_MAJORMINOR@_la_CFLAGS =    \
        $(GST_BASE_CFLAGS)                      \
        $(GST_CFLAGS)                           \
        $(LIBVA_CFLAGS)                         \
-       $(LIBVA_EXTRA_CFLAGS)                   \
        $(NULL)
 
 libgstvaapi_@GST_MAJORMINOR@_la_LIBADD =       \
        $(GST_BASE_LIBS)                        \
        $(GST_LIBS)                             \
        $(LIBVA_LIBS)                           \
-       $(LIBVA_EXTRA_LIBS)                     \
        $(NULL)
 
 libgstvaapi_x11_@GST_MAJORMINOR@_la_SOURCES =  \
@@ -111,13 +109,11 @@ libgstvaapi_x11_@GST_MAJORMINOR@_la_CFLAGS =      \
        $(GLIB_CFLAGS)                          \
        $(GST_BASE_CFLAGS)                      \
        $(LIBVA_X11_CFLAGS)                     \
-       $(LIBVA_EXTRA_CFLAGS)                   \
        $(NULL)
 
 libgstvaapi_x11_@GST_MAJORMINOR@_la_LIBADD =   \
        $(GLIB_LIBS)                            \
        $(LIBVA_X11_LIBS)                       \
-       $(LIBVA_EXTRA_LIBS)                     \
        libgstvaapi-@GST_MAJORMINOR@.la         \
        $(NULL)
 

diff --git a/sys/vaapiconvert/Makefile.am b/sys/vaapiconvert/Makefile.am
index b295d0b..74e3d37 100644 (file)
--- a/sys/vaapiconvert/Makefile.am
+++ b/sys/vaapiconvert/Makefile.am
@@ -1,11 +1,9 @@
 plugin_LTLIBRARIES = libgstvaapiconvert.la
 
 libgstvaapi_CFLAGS = \
-       $(LIBVA_EXTRA_CFLAGS) \
        -I$(top_srcdir)/gst-libs
 
 libgstvaapi_LIBS = \
-       $(LIBVA_EXTRA_LIBS) \
        $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la
 
 libgstvaapiconvert_la_SOURCES =        \

diff --git a/sys/vaapisink/Makefile.am b/sys/vaapisink/Makefile.am
index 54cacdb..9fdb921 100644 (file)
--- a/sys/vaapisink/Makefile.am
+++ b/sys/vaapisink/Makefile.am
@@ -1,11 +1,9 @@
 plugin_LTLIBRARIES = libgstvaapisink.la
 
 libgstvaapi_CFLAGS = \
-       $(LIBVA_EXTRA_CFLAGS) \
        -I$(top_srcdir)/gst-libs
 
 libgstvaapi_LIBS = \
-       $(LIBVA_EXTRA_LIBS) \
        $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_MAJORMINOR).la
 
 libgstvaapisink_la_SOURCES =   \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f42bbef..de69c18 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -5,13 +5,11 @@ noinst_PROGRAMS =     \
        $(NULL)
 
 TEST_CFLAGS = \
-       $(LIBVA_EXTRA_CFLAGS) \
        $(GST_CFLAGS) \
        -I$(top_srcdir)/gst-libs \
        $(X11_CFLAGS)
 
 TEST_LIBS = \
-       $(LIBVA_EXTRA_LIBS) \
        $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la \
        $(X11_LIBS)