[Mesa-dev] [PATCH 03/32] r300g: Use gallium automake include file

[Matt Turner]

From: Tom Stellard <tstellar at gmail.com>

[mattst88] v2: Remove ARCH_FLAGS/OPT_FLAGS
---
 src/gallium/drivers/r300/Makefile.am |    8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 79b17f6..6c4bba7 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -1,4 +1,5 @@
 include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
 
 noinst_LIBRARIES = libr300.a
 check_PROGRAMS = r300_compiler_tests
@@ -6,17 +7,14 @@ testdir = compiler/tests
 TESTS = r300_compiler_tests
 
 AM_CFLAGS = \
-	-I$(top_srcdir)/src/gallium/include \
-	-I$(top_srcdir)/src/gallium/auxiliary \
 	-I$(top_srcdir)/src/gallium/drivers \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src/mesa \
 	-I$(top_srcdir)/src/glsl \
 	-I$(top_srcdir)/src/mapi \
+	$(GALLIUM_CFLAGS) \
 	$(LLVM_CFLAGS) \
-	$(RADEON_CFLAGS) \
-	$(DEFINES) \
-	$(PIC_FLAGS)
+	$(RADEON_CFLAGS)
 
 libr300_a_SOURCES = \
 	$(C_SOURCES) \
-- 
1.7.8.6