From 3df993e1a22decc4732faf08a4d358cd90548e52 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 17 Mar 2017 16:55:25 +0000 Subject: [PATCH] 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 Reviewed-by: Kenneth Graunke --- 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 63bfd45..269d73d 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 8485984..a772b5f 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) -- 2.7.4