summaryrefslogtreecommitdiffstats
path: root/src/gallium/Automake.inc
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2013-11-01 18:58:27 +0000
committerEmil Velikov <[email protected]>2013-11-16 16:29:28 +0000
commit7dac1b470a9c1c977f79ecc301407681e200bd1a (patch)
tree39c8b75ac8223811cf006c87658c1b131e75cb0f /src/gallium/Automake.inc
parentad501a535ad731447587b259afe2ea9c0a0a02f5 (diff)
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]>
Diffstat (limited to 'src/gallium/Automake.inc')
-rw-r--r--src/gallium/Automake.inc22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/gallium/Automake.inc b/src/gallium/Automake.inc
index fabc2af9a16..5cb0b26636b 100644
--- a/src/gallium/Automake.inc
+++ b/src/gallium/Automake.inc
@@ -3,3 +3,25 @@ GALLIUM_CFLAGS = \
-I$(top_srcdir)/src/gallium/include \
-I$(top_srcdir)/src/gallium/auxiliary \
$(DEFINES)
+
+# src/gallium/auxiliary must appear before src/gallium/drivers
+# because there are stupidly two rbug_context.h files in
+# different directories, and which one is included by the
+# preprocessor is determined by the ordering of the -I flags.
+GALLIUM_DRIVER_CFLAGS = \
+ -I$(srcdir)/include \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/gallium/include \
+ -I$(top_srcdir)/src/gallium/auxiliary \
+ -I$(top_srcdir)/src/gallium/drivers \
+ $(DEFINES) \
+ $(VISIBILITY_CFLAGS)
+
+GALLIUM_DRIVER_CXXFLAGS = \
+ -I$(srcdir)/include \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/gallium/include \
+ -I$(top_srcdir)/src/gallium/auxiliary \
+ -I$(top_srcdir)/src/gallium/drivers \
+ $(DEFINES) \
+ $(VISIBILITY_CXXFLAGS)