diff options
author | Tapani Pälli <[email protected]> | 2017-07-31 11:32:34 +0300 |
---|---|---|
committer | Tapani Pälli <[email protected]> | 2017-08-02 10:31:13 +0300 |
commit | 99c764b647c815533d45450e3a6f67ff192ee2af (patch) | |
tree | 13f884a47827b6d6e8da5b1e0a49da2be84c9a9b /src/intel | |
parent | 9bd15da85da7f51acd0d0be2ad9b9d4cb8b8992d (diff) |
intel: move gen_decoder.* back to COMMON_FILES
this change reverts commit 4f695731, we want to be able to build
with -DDEBUG and gen_decoder on Android.
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src/intel')
-rw-r--r-- | src/intel/Makefile.common.am | 2 | ||||
-rw-r--r-- | src/intel/Makefile.sources | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/intel/Makefile.common.am b/src/intel/Makefile.common.am index 1c1c2eed304..49e9c6a4912 100644 --- a/src/intel/Makefile.common.am +++ b/src/intel/Makefile.common.am @@ -22,7 +22,7 @@ noinst_LTLIBRARIES += common/libintel_common.la common_libintel_common_la_CFLAGS = $(AM_CFLAGS) $(LIBDRM_CFLAGS) -common_libintel_common_la_SOURCES = $(COMMON_FILES) $(DECODER_FILES) +common_libintel_common_la_SOURCES = $(COMMON_FILES) if HAVE_PLATFORM_ANDROID common_libintel_common_la_CFLAGS += $(ANDROID_CFLAGS) diff --git a/src/intel/Makefile.sources b/src/intel/Makefile.sources index 075ee864f49..5d8785832fb 100644 --- a/src/intel/Makefile.sources +++ b/src/intel/Makefile.sources @@ -11,6 +11,8 @@ COMMON_FILES = \ common/gen_clflush.h \ 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,10 +20,6 @@ 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 \ |