[Mesa-dev] [PATCH 33/37] targets/xorg: consolidate compiler flags to Automake.inc

[Emil Velikov]

Minimise duplication and discrepencies across xorg targets.

Note: this commit adds VISIBILITY_CFLAGS to nouveau and i915

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/Automake.inc                      | 12 ++++++++++++
 src/gallium/targets/r600/xorg/Makefile.am     |  8 +-------
 src/gallium/targets/radeonsi/xorg/Makefile.am |  8 +-------
 src/gallium/targets/xorg-i915/Makefile.am     |  7 +------
 src/gallium/targets/xorg-nouveau/Makefile.am  |  7 +------
 5 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index 5ed6a3d..016a1e2 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -37,6 +37,18 @@ GALLIUM_VIDEO_CFLAGS = \
 	$(LIBDRM_CFLAGS) \
 	$(VISIBILITY_CFLAGS)
 
+GALLIUM_XORG_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 \
+	-DHAVE_CONFIG_H \
+	$(DEFINES) \
+	$(PTHREAD_CFLAGS) \
+	$(XORG_CFLAGS) \
+	$(VISIBILITY_CFLAGS)
+
 GALLIUM_VDPAU_LINKER_FLAGS = \
 	-module \
 	-version-number $(VDPAU_MAJOR):$(VDPAU_MINOR) \
diff --git a/src/gallium/targets/r600/xorg/Makefile.am b/src/gallium/targets/r600/xorg/Makefile.am
index 3e51841..411df77 100644
--- a/src/gallium/targets/r600/xorg/Makefile.am
+++ b/src/gallium/targets/r600/xorg/Makefile.am
@@ -23,14 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(PTHREAD_CFLAGS) \
-	$(XORG_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
+	$(GALLIUM_XORG_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-DHAVE_CONFIG_H \
 	-DGALLIUM_RBUG \
 	-DGALLIUM_TRACE \
 	-DGALLIUM_GALAHAD
diff --git a/src/gallium/targets/radeonsi/xorg/Makefile.am b/src/gallium/targets/radeonsi/xorg/Makefile.am
index 1825447..1e518e0 100644
--- a/src/gallium/targets/radeonsi/xorg/Makefile.am
+++ b/src/gallium/targets/radeonsi/xorg/Makefile.am
@@ -23,14 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(PTHREAD_CFLAGS) \
-	$(XORG_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
+	$(GALLIUM_XORG_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-DHAVE_CONFIG_H \
 	-DGALLIUM_RBUG \
 	-DGALLIUM_TRACE \
 	-DGALLIUM_GALAHAD
diff --git a/src/gallium/targets/xorg-i915/Makefile.am b/src/gallium/targets/xorg-i915/Makefile.am
index ed2ab8a..5def18d 100644
--- a/src/gallium/targets/xorg-i915/Makefile.am
+++ b/src/gallium/targets/xorg-i915/Makefile.am
@@ -23,13 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(PTHREAD_CFLAGS) \
-	$(XORG_CFLAGS)
+	$(GALLIUM_XORG_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-DHAVE_CONFIG_H \
 	-DGALLIUM_RBUG \
 	-DGALLIUM_TRACE \
 	-DGALLIUM_GALAHAD
diff --git a/src/gallium/targets/xorg-nouveau/Makefile.am b/src/gallium/targets/xorg-nouveau/Makefile.am
index 210d4a2..55177d3 100644
--- a/src/gallium/targets/xorg-nouveau/Makefile.am
+++ b/src/gallium/targets/xorg-nouveau/Makefile.am
@@ -23,13 +23,8 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
-	$(GALLIUM_CFLAGS) \
-	$(PTHREAD_CFLAGS) \
-	$(XORG_CFLAGS)
+	$(GALLIUM_XORG_CFLAGS)
 AM_CPPFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/src/gallium/winsys \
-	-DHAVE_CONFIG_H \
 	-DGALLIUM_RBUG \
 	-DGALLIUM_TRACE
 
-- 
1.8.4.2