targets/vdpau: compact compiler flags into Automake.inc

Store the compiler flags into a variable, in order to minimise
flags duplication (amongst vdpau and xvmc).

Note: this commit add VISIBILITY_CFLAGS to the nouveau target

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 5cb0b26636b2c9fa19e897c8a1795a0fdddf1a12..b242bb4ced7f814fa91d58b64927a440acca4d89 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -25,3 +25,14 @@ GALLIUM_DRIVER_CXXFLAGS = \
        -I$(top_srcdir)/src/gallium/drivers \
        $(DEFINES) \
        $(VISIBILITY_CXXFLAGS)
+
+GALLIUM_VIDEO_CFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/winsys \
+       $(DEFINES) \
+       $(PTHREAD_CFLAGS) \
+       $(LIBDRM_CFLAGS) \
+       $(VISIBILITY_CFLAGS)

diff --git a/src/gallium/targets/r600/vdpau/Makefile.am b/src/gallium/targets/r600/vdpau/Makefile.am
index 70af0bffa0f1e16a68a08f9f1b97fb54fa9d52da..742df52074f86192c82e2938da7d3010b1d3babc 100644 (file)
--- a/src/gallium/targets/r600/vdpau/Makefile.am
+++ b/src/gallium/targets/r600/vdpau/Makefile.am
@@ -23,13 +23,7 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys
+       $(GALLIUM_VIDEO_CFLAGS)
 
 vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
 vdpau_LTLIBRARIES = libvdpau_r600.la

diff --git a/src/gallium/targets/radeonsi/vdpau/Makefile.am b/src/gallium/targets/radeonsi/vdpau/Makefile.am
index a4d97fe6b90ab6e7fe02d84750b4c43374306726..9b14634b6d2c6b5659a8042119ce42b6404e8360 100644 (file)
--- a/src/gallium/targets/radeonsi/vdpau/Makefile.am
+++ b/src/gallium/targets/radeonsi/vdpau/Makefile.am
@@ -23,13 +23,7 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys
+       $(GALLIUM_VIDEO_CFLAGS)
 
 vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
 vdpau_LTLIBRARIES = libvdpau_radeonsi.la

diff --git a/src/gallium/targets/vdpau-nouveau/Makefile.am b/src/gallium/targets/vdpau-nouveau/Makefile.am
index 213725a88c8d4692a723390028cfbc3b3076cf5e..20eb9208e2ba0988ef66c90be771401c07f7749a 100644 (file)
--- a/src/gallium/targets/vdpau-nouveau/Makefile.am
+++ b/src/gallium/targets/vdpau-nouveau/Makefile.am
@@ -23,12 +23,7 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS)
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys
+       $(GALLIUM_VIDEO_CFLAGS)
 
 vdpaudir = $(VDPAU_LIB_INSTALL_DIR)
 vdpau_LTLIBRARIES = libvdpau_nouveau.la