Mesa (master): intel: automake: move INTEL_CFLAGS as applicable

[Emil Velikov]

Module: Mesa
Branch: master
Commit: 3df993e1a22decc4732faf08a4d358cd90548e52
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3df993e1a22decc4732faf08a4d358cd90548e52

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Fri Mar 17 16:55:25 2017 +0000

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 <emil.velikov at collabora.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>

---

 src/intel/Makefile.am        | 1 -
 src/intel/Makefile.common.am | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/intel/Makefile.am b/src/intel/Makefile.am
index 63bfd45fdd..269d73dfcb 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 848598457c..a772b5fcd1 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)