Mesa (master): isl: automake: don' t include isl_format_layout.c in two lists.

[Emil Velikov]

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

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Tue May 31 16:59:39 2016 +0100

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 <emil.velikov at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>

---

 src/intel/isl/Makefile.am      | 2 +-
 src/intel/isl/Makefile.sources | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am
index 4922b1f..74f863a 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 fe6a00f..89b1418 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 \