isl: move the sources lists to Makefile.sources

[Emil Velikov: use the file in the autoconf build]
Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am
index 46b2683b4ab45b84630fe2c46aa715b455215e6b..4922b1fbe4aaddd46c4586dd1aa78cdc9f30c539 100644 (file)
--- a/src/intel/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
@@ -19,6 +19,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
+include Makefile.sources
+
 ISL_GEN_LIBS =                                           \
        libisl-gen7.la                                   \
        libisl-gen75.la                                  \
@@ -48,47 +50,21 @@ libisl_la_CFLAGS = $(CFLAGS) -Wno-override-init
 
 libisl_la_LIBADD = $(ISL_GEN_LIBS)
 
-libisl_la_SOURCES =                                     \
-       isl.c                                           \
-       isl.h                                           \
-       isl_format.c                                    \
-       isl_format_layout.c                             \
-       isl_gen4.c                                      \
-       isl_gen4.h                                      \
-       isl_gen6.c                                      \
-       isl_gen6.h                                      \
-       isl_priv.h                                      \
-       isl_storage_image.c                             \
-       $(NULL)
+libisl_la_SOURCES = $(ISL_FILES)
 
-libisl_gen7_la_SOURCES =                                \
-       isl_gen7.c                                      \
-       isl_gen7.h                                      \
-        isl_surface_state.c                             \
-       $(NULL)
+libisl_gen7_la_SOURCES = $(ISL_GEN7_FILES)
 libisl_gen7_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=70
 
-libisl_gen75_la_SOURCES =                               \
-        isl_surface_state.c                             \
-       $(NULL)
+libisl_gen75_la_SOURCES = $(ISL_GEN75_FILES)
 libisl_gen75_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=75
 
-libisl_gen8_la_SOURCES =                                \
-       isl_gen8.c                                      \
-       isl_gen8.h                                      \
-        isl_surface_state.c                             \
-       $(NULL)
+libisl_gen8_la_SOURCES = $(ISL_GEN8_FILES)
 libisl_gen8_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=80
 
-libisl_gen9_la_SOURCES =                                \
-       isl_gen9.c                                      \
-       isl_gen9.h                                      \
-        isl_surface_state.c                             \
-       $(NULL)
+libisl_gen9_la_SOURCES = $(ISL_GEN9_FILES)
 libisl_gen9_la_CFLAGS = $(libisl_la_CFLAGS) -DGEN_VERSIONx10=90
 
-BUILT_SOURCES =                                         \
-       isl_format_layout.c
+BUILT_SOURCES = $(ISL_GENERATED_FILES)
 
 isl_format_layout.c: isl_format_layout_gen.bash \
                      isl_format_layout.csv

diff --git a/src/intel/isl/Makefile.sources b/src/intel/isl/Makefile.sources
new file mode 100644 (file)
index 0000000..e06568b
--- /dev/null
+++ b/src/intel/isl/Makefile.sources
@@ -0,0 +1,31 @@
+ISL_FILES = \
+       isl.c \
+       isl.h \
+       isl_format.c \
+       isl_format_layout.c \
+       isl_gen4.c \
+       isl_gen4.h \
+       isl_gen6.c \
+       isl_gen6.h \
+       isl_storage_image.c
+
+ISL_GEN7_FILES = \
+       isl_gen7.c \
+       isl_gen7.h \
+       isl_surface_state.c
+
+ISL_GEN75_FILES = \
+       isl_surface_state.c
+
+ISL_GEN8_FILES = \
+       isl_gen8.c \
+       isl_gen8.h \
+       isl_surface_state.c
+
+ISL_GEN9_FILES = \
+       isl_gen9.c \
+       isl_gen9.h \
+       isl_surface_state.c
+
+ISL_GENERATED_FILES = \
+       isl_format_layout.c