anv: Support v3 of VK_EXT_vertex_attribute_divisor

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

diff --git a/src/intel/Makefile.compiler.am b/src/intel/Makefile.compiler.am
index b30c01a5bde4d29546f5972a857b61670fe7e6c4..46711fe71b76c25d613234c965dff09f7d984a4d 100644 (file)
--- a/src/intel/Makefile.compiler.am
+++ b/src/intel/Makefile.compiler.am
@@ -35,7 +35,7 @@ BUILT_SOURCES += $(COMPILER_GENERATED_FILES)
 compiler/brw_nir_trig_workarounds.c: compiler/brw_nir_trig_workarounds.py \
                                      $(top_srcdir)/src/compiler/nir/nir_algebraic.py
        $(MKDIR_GEN)
-       $(AM_V_GEN) PYTHONPATH=$(top_srcdir)/src/compiler/nir $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py > $@ || ($(RM) $@; false)
+       $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/compiler/brw_nir_trig_workarounds.py -p $(top_srcdir)/src/compiler/nir > $@ || ($(RM) $@; false)
 
 EXTRA_DIST += \
        compiler/brw_nir_trig_workarounds.py
@@ -45,11 +45,13 @@ EXTRA_DIST += \
 # ----------------------------------------------------------------------------
 
 TEST_LIBS = \
+       $(top_builddir)/src/gtest/libgtest.la \
        compiler/libintel_compiler.la \
        common/libintel_common.la \
+       dev/libintel_dev.la \
        $(top_builddir)/src/compiler/nir/libnir.la \
-       $(top_builddir)/src/util/libmesautil.la \
        $(top_builddir)/src/intel/isl/libisl.la \
+       $(top_builddir)/src/util/libmesautil.la \
        $(PTHREAD_LIBS) \
        $(DLOPEN_LIBS)
 
@@ -69,53 +71,38 @@ check_PROGRAMS += $(COMPILER_TESTS)
 
 compiler_test_fs_cmod_propagation_SOURCES = \
        compiler/test_fs_cmod_propagation.cpp
-compiler_test_fs_cmod_propagation_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_fs_cmod_propagation_LDADD = $(TEST_LIBS)
 
 compiler_test_fs_copy_propagation_SOURCES = \
        compiler/test_fs_copy_propagation.cpp
-compiler_test_fs_copy_propagation_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_fs_copy_propagation_LDADD = $(TEST_LIBS)
 
 compiler_test_fs_saturate_propagation_SOURCES = \
        compiler/test_fs_saturate_propagation.cpp
-compiler_test_fs_saturate_propagation_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_fs_saturate_propagation_LDADD = $(TEST_LIBS)
 
 compiler_test_vf_float_conversions_SOURCES = \
        compiler/test_vf_float_conversions.cpp
-compiler_test_vf_float_conversions_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_vf_float_conversions_LDADD = $(TEST_LIBS)
 
 compiler_test_vec4_register_coalesce_SOURCES = \
        compiler/test_vec4_register_coalesce.cpp
-compiler_test_vec4_register_coalesce_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_vec4_register_coalesce_LDADD = $(TEST_LIBS)
 
 compiler_test_vec4_copy_propagation_SOURCES = \
        compiler/test_vec4_copy_propagation.cpp
-compiler_test_vec4_copy_propagation_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_vec4_copy_propagation_LDADD = $(TEST_LIBS)
 
 compiler_test_vec4_cmod_propagation_SOURCES = \
        compiler/test_vec4_cmod_propagation.cpp
-compiler_test_vec4_cmod_propagation_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_vec4_cmod_propagation_LDADD = $(TEST_LIBS)
 
+# Strictly speaking this is neither a C++ test nor using gtest - we can address
+# address that at a later point. Until then, this allows us a to simplify things.
 compiler_test_eu_compact_SOURCES = \
-       compiler/test_eu_compact.c
-nodist_EXTRA_compiler_test_eu_compact_SOURCES = dummy.cpp
+       compiler/test_eu_compact.cpp
 compiler_test_eu_compact_LDADD = $(TEST_LIBS)
 
 compiler_test_eu_validate_SOURCES = \
        compiler/test_eu_validate.cpp
-compiler_test_eu_validate_LDADD = \
-       $(top_builddir)/src/gtest/libgtest.la \
-       $(TEST_LIBS)
+compiler_test_eu_validate_LDADD = $(TEST_LIBS)