From 53a2167e68f27dd8bed26cba92b978fe1d6d4188 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 27 May 2016 15:35:31 +0100 Subject: [PATCH] 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 Reviewed-by: Matt Turner Reviewed-by: Jason Ekstrand --- src/intel/isl/Makefile.am | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am index 51e2ae1733f..57313baa4f2 100644 --- 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 = \ -- 2.30.2