Merge remote-tracking branch 'mesa-public/master' into vulkan

[mesa.git] / src / mesa / drivers / dri / i965 / Makefile.am

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index a2c3b32da88caa41b249b8fa9b5df65e25bab3e4..3c8197226fe5d527685036fc3dfc3d69fccd9f23 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -28,9 +28,12 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/ \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
        -I$(top_srcdir)/src/mesa/drivers/dri/common \
        -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
        -I$(top_srcdir)/src/gtest/include \
+       -I$(top_builddir)/src/glsl/nir \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
        $(VISIBILITY_CFLAGS) \
@@ -38,37 +41,71 @@ AM_CFLAGS = \
 
 AM_CXXFLAGS = $(AM_CFLAGS)
 
-noinst_LTLIBRARIES = libi965_dri.la
+noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la
 libi965_dri_la_SOURCES = $(i965_FILES)
 libi965_dri_la_LIBADD = $(INTEL_LIBS)
 
 TEST_LIBS = \
        libi965_dri.la \
        ../common/libdricommon.la \
+       ../common/libxmlconfig.la \
        ../common/libmegadriver_stub.la \
         ../../../libmesa.la \
        $(DRI_LIB_DEPS) \
-        -lrt \
+        $(CLOCK_LIB) \
        ../common/libdri_test_stubs.la
 
+libi965_compiler_la_SOURCES = $(i965_FILES)
+libi965_compiler_la_LIBADD = $(INTEL_LIBS) \
+       ../common/libdricommon.la \
+       ../common/libxmlconfig.la \
+       ../common/libmegadriver_stub.la \
+        ../../../libmesa.la \
+       $(DRI_LIB_DEPS) \
+        $(CLOCK_LIB) \
+       ../common/libdri_test_stubs.la -lm
+
 TESTS = \
+       test_fs_cmod_propagation \
+       test_fs_saturate_propagation \
         test_eu_compact \
-        test_vec4_register_coalesce \
-        test_blorp_blit_eu_gen
+       test_vf_float_conversions \
+        test_vec4_copy_propagation \
+        test_vec4_register_coalesce
 
 check_PROGRAMS = $(TESTS)
 
+test_fs_cmod_propagation_SOURCES = \
+       test_fs_cmod_propagation.cpp
+test_fs_cmod_propagation_LDADD = \
+       $(top_builddir)/src/gtest/libgtest.la \
+       $(TEST_LIBS)
+
+test_fs_saturate_propagation_SOURCES = \
+       test_fs_saturate_propagation.cpp
+test_fs_saturate_propagation_LDADD = \
+       $(top_builddir)/src/gtest/libgtest.la \
+       $(TEST_LIBS)
+
+test_vf_float_conversions_SOURCES = \
+       test_vf_float_conversions.cpp
+test_vf_float_conversions_LDADD = \
+       $(top_builddir)/src/gtest/libgtest.la \
+       $(TEST_LIBS)
+
 test_vec4_register_coalesce_SOURCES = \
        test_vec4_register_coalesce.cpp
 test_vec4_register_coalesce_LDADD = \
-        $(TEST_LIBS) \
-        $(top_builddir)/src/gtest/libgtest.la
+        $(top_builddir)/src/gtest/libgtest.la \
+        $(TEST_LIBS)
+
+test_vec4_copy_propagation_SOURCES = \
+       test_vec4_copy_propagation.cpp
+test_vec4_copy_propagation_LDADD = \
+        $(top_builddir)/src/gtest/libgtest.la \
+        $(TEST_LIBS)
 
 test_eu_compact_SOURCES = \
        test_eu_compact.c
 nodist_EXTRA_test_eu_compact_SOURCES = dummy.cpp
 test_eu_compact_LDADD = $(TEST_LIBS)
-
-test_blorp_blit_eu_gen_SOURCES = \
-        test_blorp_blit_eu_gen.cpp
-test_blorp_blit_eu_gen_LDADD = $(TEST_LIBS)