summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-03-17 16:55:25 +0000
committerEmil Velikov <[email protected]>2017-03-30 19:07:28 +0100
commit3df993e1a22decc4732faf08a4d358cd90548e52 (patch)
treec24e23c75b2aef62bd1a59e480165e67b8f6d0dd
parent4ffb3949616e0aaf2f46a4c1a59421bb5a21ad9b (diff)
intel: automake: move INTEL_CFLAGS as applicable
Only common/decoder.[ch] requires it [for intel_aub.h]. v2: The code was moved to from intel/tools to intel/common, update accordingly. Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/intel/Makefile.am1
-rw-r--r--src/intel/Makefile.common.am1
2 files changed, 1 insertions, 1 deletions
diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 63bfd45fdd1..269d73dfcb0 100644
--- a/src/intel/Makefile.am
+++ b/src/intel/Makefile.am
@@ -37,7 +37,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/gallium/auxiliary \
-I$(top_srcdir)/src/gallium/include \
- $(INTEL_CFLAGS) \
$(VALGRIND_CFLAGS) \
$(DEFINES)
diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index 848598457ca..a772b5fcd12 100644
--- a/src/intel/Makefile.common.am
+++ b/src/intel/Makefile.common.am
@@ -21,4 +21,5 @@
noinst_LTLIBRARIES += common/libintel_common.la
+common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS)
common_libintel_common_la_SOURCES = $(COMMON_FILES) $(DECODER_FILES)