targets/dri: compact compiler flags into Automake.inc

Greatly reduce duplication and provide a sane minimum of
CFLAGS for all DRI targets.

Note: This commit adds VISIBILITY_CFLAGS to the following:
* freedreno
* i915
* ilo
* nouveau
* vmwgfx

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

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 5ed6a3d852c758610892ced1a719c928535f52d9..2a3ad21d20c37c2997797f4209f0a3e76b269396 100644 (file)
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -26,6 +26,19 @@ GALLIUM_DRIVER_CXXFLAGS = \
        $(DEFINES) \
        $(VISIBILITY_CXXFLAGS)
 
+GALLIUM_DRI_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 \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/mapi \
+       $(DEFINES) \
+       $(PTHREAD_CFLAGS) \
+       $(LIBDRM_CFLAGS) \
+       $(VISIBILITY_CFLAGS)
+
 GALLIUM_VIDEO_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src/gallium/include \

diff --git a/src/gallium/targets/dri-freedreno/Makefile.am b/src/gallium/targets/dri-freedreno/Makefile.am
index 228fafc65ff70d79595bd586b9bd9f2615553340..2708dd3d46628ec4246f35855e7b8b41740d5f9b 100644 (file)
--- a/src/gallium/targets/dri-freedreno/Makefile.am
+++ b/src/gallium/targets/dri-freedreno/Makefile.am
@@ -23,15 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_NOOP

diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am
index 851c412ce296d7284117800ab1636f0961f296dc..582c27042a9cc7883ea2632f1e0876885bf27ee4 100644 (file)
--- a/src/gallium/targets/dri-i915/Makefile.am
+++ b/src/gallium/targets/dri-i915/Makefile.am
@@ -23,15 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_GALAHAD \

diff --git a/src/gallium/targets/dri-ilo/Makefile.am b/src/gallium/targets/dri-ilo/Makefile.am
index 776c970ce8f85893a077fb6cf0b825783ee0645b..3633d08358923df1505d6036c049b043f1283c7f 100644 (file)
--- a/src/gallium/targets/dri-ilo/Makefile.am
+++ b/src/gallium/targets/dri-ilo/Makefile.am
@@ -24,15 +24,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_GALAHAD

diff --git a/src/gallium/targets/dri-nouveau/Makefile.am b/src/gallium/targets/dri-nouveau/Makefile.am
index 17b2c4a4adad862a561e2b7768452954e36a9a93..120e2429fddeb2e159af5c563e1331dbdc70e22a 100644 (file)
--- a/src/gallium/targets/dri-nouveau/Makefile.am
+++ b/src/gallium/targets/dri-nouveau/Makefile.am
@@ -23,15 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE
 

diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
index cddbbe32bb449ea25c06df3463bb233afaa85176..11166ae6987bd9446c1bb706dc32b84c16065a70 100644 (file)
--- a/src/gallium/targets/dri-swrast/Makefile.am
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -23,17 +23,10 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
        $(EXPAT_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/winsys/sw/dri \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \

diff --git a/src/gallium/targets/dri-vmwgfx/Makefile.am b/src/gallium/targets/dri-vmwgfx/Makefile.am
index 5ff521e5493eb6ae58d920836fe3c6cdf02f08bf..24df85285d173fe79b0ff3170a7424edfbb96ebe 100644 (file)
--- a/src/gallium/targets/dri-vmwgfx/Makefile.am
+++ b/src/gallium/targets/dri-vmwgfx/Makefile.am
@@ -23,15 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE
 

diff --git a/src/gallium/targets/r300/dri/Makefile.am b/src/gallium/targets/r300/dri/Makefile.am
index 3f659c9149486dbd9862e6e437e1b2ce816ee6fd..8b0b768da9060263cd7264ed84468f01f04f14da 100644 (file)
--- a/src/gallium/targets/r300/dri/Makefile.am
+++ b/src/gallium/targets/r300/dri/Makefile.am
@@ -23,16 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_GALAHAD

diff --git a/src/gallium/targets/r600/dri/Makefile.am b/src/gallium/targets/r600/dri/Makefile.am
index b5ea37a28b83d7c924d142396d04401adb92a5a6..62284d1f7ff9e70506e4d88b6b9d1dce3303672d 100644 (file)
--- a/src/gallium/targets/r600/dri/Makefile.am
+++ b/src/gallium/targets/r600/dri/Makefile.am
@@ -23,16 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_NOOP

diff --git a/src/gallium/targets/radeonsi/dri/Makefile.am b/src/gallium/targets/radeonsi/dri/Makefile.am
index 9eb21cd9f4ff2be9a7de60d23a795f4d205ada96..aacb18c99697eefb36810469c06d8beb144edfdd 100644 (file)
--- a/src/gallium/targets/radeonsi/dri/Makefile.am
+++ b/src/gallium/targets/radeonsi/dri/Makefile.am
@@ -23,16 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-       $(GALLIUM_CFLAGS) \
-       $(PTHREAD_CFLAGS) \
-       $(LIBDRM_CFLAGS) \
-       $(VISIBILITY_CFLAGS)
+       $(GALLIUM_DRI_CFLAGS)
 AM_CPPFLAGS = \
-       -I$(top_srcdir)/src/gallium/drivers \
-       -I$(top_srcdir)/src/gallium/winsys \
-       -I$(top_srcdir)/src/mesa \
-       -I$(top_srcdir)/src/mapi \
-       -I$(top_builddir)/src/mesa/drivers/dri/common \
        -DGALLIUM_RBUG \
        -DGALLIUM_TRACE \
        -DGALLIUM_NOOP