From: Tom Stellard <tstellar@gmail.com>
Date: Fri, 24 Aug 2012 18:42:35 +0000 (-0700)
Subject: r300g: Use gallium automake include file
X-Git-Tag: android-x86-4.4-r1~2032
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c07c2696c72ac02dfeab837f006b999c4519f67f;p=android-x86%2Fexternal-mesa.git

r300g: Use gallium automake include file

[mattst88] v2: Remove ARCH_FLAGS/OPT_FLAGS
---

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 020134985bf..adf3bc38008 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,18 +7,15 @@ 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 \
 	$(VISIBILITY_CFLAGS) \
+	$(GALLIUM_CFLAGS) \
 	$(LLVM_CFLAGS) \
-	$(RADEON_CFLAGS) \
-	$(DEFINES) \
-	$(PIC_FLAGS)
+	$(RADEON_CFLAGS)
 
 libr300_a_SOURCES = \
 	$(C_SOURCES) \