diff options
| author | Emil Velikov <[email protected]> | 2013-11-09 22:48:44 +0000 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2013-11-16 16:31:02 +0000 |
| commit | 23588a9c04ca267799e8c85079cf5667a435790e (patch) | |
| tree | ab789a51b54b31888e722f28cd21c0e70a2336c6 /src | |
| parent | 7dac1b470a9c1c977f79ecc301407681e200bd1a (diff) | |
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 <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/Automake.inc | 11 | ||||
| -rw-r--r-- | src/gallium/targets/r600/vdpau/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gallium/targets/radeonsi/vdpau/Makefile.am | 8 | ||||
| -rw-r--r-- | src/gallium/targets/vdpau-nouveau/Makefile.am | 7 |
4 files changed, 14 insertions, 20 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc index 5cb0b26636b..b242bb4ced7 100644 --- 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 70af0bffa0f..742df52074f 100644 --- 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 a4d97fe6b90..9b14634b6d2 100644 --- 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 213725a88c8..20eb9208e2b 100644 --- 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 |