summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2016-05-31 16:59:39 +0100
committerEmil Velikov <[email protected]>2016-06-02 22:26:04 +0100
commitaf1a0ae8cebb62fe9ce4b78c3e95185ea62ccdf0 (patch)
tree3f83e1ddc5040ddc9f0afe33539da7d77ace3aba
parentaf2637aa32aac1ef512433407385e8e2bf711aea (diff)
isl: automake: don't include isl_format_layout.c in two lists.
Including the file in both ISL_FILES and ISL_GENERATED_FILES makes the actual dependency list less obvious. v2: Drop unrelated vulkan hunk (Jason). Signed-off-by: Emil Velikov <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]>
-rw-r--r--src/intel/isl/Makefile.am2
-rw-r--r--src/intel/isl/Makefile.sources1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am
index 4922b1fbe4a..74f863ab697 100644
--- a/src/intel/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
@@ -50,7 +50,7 @@ libisl_la_CFLAGS = $(CFLAGS) -Wno-override-init
libisl_la_LIBADD = $(ISL_GEN_LIBS)
-libisl_la_SOURCES = $(ISL_FILES)
+libisl_la_SOURCES = $(ISL_FILES) $(ISL_GENERATED_FILES)
libisl_gen7_la_SOURCES = $(ISL_GEN7_FILES)
libisl_gen7_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=70
diff --git a/src/intel/isl/Makefile.sources b/src/intel/isl/Makefile.sources
index fe6a00f1682..89b1418ffc7 100644
--- a/src/intel/isl/Makefile.sources
+++ b/src/intel/isl/Makefile.sources
@@ -2,7 +2,6 @@ ISL_FILES = \
isl.c \
isl.h \
isl_format.c \
- isl_format_layout.c \
isl_gen4.c \
isl_gen4.h \
isl_gen6.c \