gallium/drivers: compact compiler flags into Automake.inc

* minimise flags duplication
* distingush between VISIBILITY C and CXX flags
* set only required flags - C and/or CXX

v2: add LLVM_CFLAGS back to AM_CFLAGS (add missing backslash)

Signed-off-by: Emil Velikov <[email protected]>

1 files changed, 10 insertions, 18 deletions

diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
index cede6fa1ff1..b2e37085f23 100644
--- a/src/gallium/drivers/r600/Makefile.am
+++ b/src/gallium/drivers/r600/Makefile.am
@@ -3,23 +3,15 @@ AUTOMAKE_OPTIONS = subdir-objects
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-noinst_LTLIBRARIES = libr600.la
-
 AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/include \
-	$(GALLIUM_CFLAGS) \
-	$(RADEON_CFLAGS) \
-	$(VISIBILITY_CFLAGS)
+	$(GALLIUM_DRIVER_CFLAGS) \
+	$(RADEON_CFLAGS)
 
 AM_CXXFLAGS = \
-	-I$(top_srcdir)/src/gallium/drivers \
-	-I$(top_srcdir)/include \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
-	$(RADEON_CFLAGS) \
-	$(DEFINES) \
-	$(VISIBILITY_CFLAGS)
+	$(GALLIUM_DRIVER_CXXFLAGS) \
+	$(RADEON_CFLAGS)
+
+noinst_LTLIBRARIES = libr600.la
 
 libr600_la_SOURCES = \
 	$(C_SOURCES) \
@@ -29,15 +21,15 @@ libr600_la_LIBADD = ../radeon/libradeon.la
 
 if NEED_RADEON_LLVM
 
+AM_CFLAGS += \
+	$(LLVM_CFLAGS) \
+	-I$(top_srcdir)/src/gallium/drivers/radeon/
+
 libr600_la_SOURCES += \
 	$(LLVM_C_SOURCES)
 
 libr600_la_LIBADD += ../radeon/libllvmradeon.la
 
-AM_CFLAGS += \
-	$(LLVM_CFLAGS) \
-	-I$(top_srcdir)/src/gallium/drivers/radeon/
-
 endif
 
 if USE_R600_LLVM_COMPILER