isl: automake: flatten the tests rules

[mesa.git] / src / intel / isl / Makefile.am

diff --git a/src/intel/isl/Makefile.am b/src/intel/isl/Makefile.am
index 806934eae5b5b0e52dbfec0c6f3b91f0a935962b..57313baa4f2378cf5c361111a8cbffd1d9138936 100644 (file)
--- a/src/intel/isl/Makefile.am
+++ b/src/intel/isl/Makefile.am
@@ -19,9 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = .
-
-
 ISL_GEN_LIBS =                                           \
        libisl-gen7.la                                   \
        libisl-gen75.la                                  \
@@ -31,8 +28,6 @@ ISL_GEN_LIBS =                                           \
 
 noinst_LTLIBRARIES = $(ISL_GEN_LIBS) libisl.la
 
-EXTRA_DIST = tests
-
 # The gallium includes are for the util/u_math.h include from main/macros.h
 AM_CPPFLAGS = \
        $(INTEL_CFLAGS) \
@@ -63,6 +58,7 @@ libisl_la_SOURCES =                                     \
        isl_gen4.h                                      \
        isl_gen6.c                                      \
        isl_gen6.h                                      \
+       isl_priv.h                                      \
        isl_storage_image.c                             \
        $(NULL)
 
@@ -104,20 +100,18 @@ isl_format_layout.c: isl_format_layout_gen.bash \
 #  Tests
 # ----------------------------------------------------------------------------
 
-TESTS = tests/isl_surf_get_image_offset_test
-
-check_PROGRAMS = $(TESTS)
+check_PROGRAMS = tests/isl_surf_get_image_offset_test
 
-# Link tests to lib965_compiler.la for brw_get_device_info().
-tests_ldadd =                                          \
-       -lm                                             \
-       libisl.la                                       \
-       $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la
+TESTS = $(check_PROGRAMS)
 
-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)
+tests_isl_surf_get_image_offset_test_LDADD = \
+       libisl.la \
+       $(top_builddir)/src/mesa/drivers/dri/i965/libi965_compiler.la \
+       -lm
 
 # ----------------------------------------------------------------------------
 
-include $(top_srcdir)/install-lib-links.mk
+EXTRA_DIST = \
+       isl_format_layout_gen.bash \
+       isl_format_layout.csv \
+       README