Mesa (master): intel: move gen_decoder.* to DECODER_FILES

Tapani Pälli tpalli at kemper.freedesktop.org
Thu Mar 23 12:06:12 UTC 2017


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

Author: Tapani Pälli <tapani.palli at intel.com>
Date:   Thu Mar 23 09:15:54 2017 +0200

intel: move gen_decoder.* to DECODER_FILES

patch adds DECODER_FILES for libintel_common, this is so that platforms
such as Android not currently using this functionality can opt out.

Fixes: 7d84bb3 ("intel: Move tools/decoder.[ch] to common/gen_decoder.[ch].")
Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Emil Velikov <emil.velikov at collabora.com>

---

 src/intel/Makefile.common.am | 2 +-
 src/intel/Makefile.sources   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am
index a8be54a265..848598457c 100644
--- a/src/intel/Makefile.common.am
+++ b/src/intel/Makefile.common.am
@@ -21,4 +21,4 @@
 
 noinst_LTLIBRARIES += common/libintel_common.la
 
-common_libintel_common_la_SOURCES = $(COMMON_FILES)
+common_libintel_common_la_SOURCES = $(COMMON_FILES) $(DECODER_FILES)
diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources
index 839ea47d75..bdd8fe636f 100644
--- a/src/intel/Makefile.sources
+++ b/src/intel/Makefile.sources
@@ -9,8 +9,6 @@ BLORP_FILES = \
 COMMON_FILES = \
 	common/gen_debug.c \
 	common/gen_debug.h \
-	common/gen_decoder.c \
-	common/gen_decoder.h \
 	common/gen_device_info.c \
 	common/gen_device_info.h \
 	common/gen_l3_config.c \
@@ -18,6 +16,10 @@ COMMON_FILES = \
 	common/gen_urb_config.c \
 	common/gen_sample_positions.h
 
+DECODER_FILES = \
+	common/gen_decoder.h \
+	common/gen_decoder.c
+
 COMPILER_FILES = \
 	compiler/brw_cfg.cpp \
 	compiler/brw_cfg.h \




More information about the mesa-commit mailing list