isl: automake: flatten the tests rules

Fold the unneeded extra variable tests_ldadd, the explicit sources
section (single file with the default extension) and flip the
check_PROGRAMS <> TESTS order (TESTS includes scripts, while
check_PROGRAMS is binaries only).

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 51e2ae1733fde8a331eb87361c4e75fc3b9ce21d..57313baa4f2378cf5c361111a8cbffd1d9138936 100644 (file)
--- a/src/intel/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
@@ -100,20 +100,15 @@ isl_format_layout.c: isl_format_layout_gen.bash \
 #  Tests
 # ----------------------------------------------------------------------------
 
-TESTS = tests/isl_surf_get_image_offset_test
+check_PROGRAMS = tests/isl_surf_get_image_offset_test
 
-check_PROGRAMS = $(TESTS)
+TESTS = $(check_PROGRAMS)
 
-# Link tests to lib965_compiler.la for brw_get_device_info().
-tests_ldadd =                                          \
-       libisl.la                                       \
+tests_isl_surf_get_image_offset_test_LDADD = \
+       libisl.la \
        $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
        -lm
 
-tests_isl_surf_get_image_offset_test_SOURCES =         \
-       tests/isl_surf_get_image_offset_test.c
-tests_isl_surf_get_image_offset_test_LDADD = $(tests_ldadd)
-
 # ----------------------------------------------------------------------------
 
 EXTRA_DIST = \