gallium: enable GL_AMD_depth_clamp_separate on r600, radeonsi

[mesa.git] / src / gallium / drivers / r300 / Makefile.am

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index e74e44542beeb795b7b4f344dc958042a9fd55b4..26c75be32715375dc7f0856aa2e53cd65b9ff76f 100644 (file)
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -1,5 +1,3 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
@@ -13,26 +11,22 @@ AM_CFLAGS = \
        $(LLVM_CFLAGS) \
        $(RADEON_CFLAGS)
 
-noinst_LTLIBRARIES = libr300.la libr300-helper.la
+noinst_LTLIBRARIES = libr300.la
 check_PROGRAMS = r300_compiler_tests
 TESTS = r300_compiler_tests
 
-r300_compiler_tests_LDADD = libr300.la libr300-helper.la \
+r300_compiler_tests_LDADD = libr300.la \
        $(top_builddir)/src/gallium/auxiliary/libgallium.la \
        $(top_builddir)/src/util/libmesautil.la \
        $(GALLIUM_COMMON_LIB_DEPS)
 r300_compiler_tests_CPPFLAGS = \
+       -DTEST_PATH=\"$(top_srcdir)/src/gallium/drivers/r300/compiler/tests\" \
        -I$(top_srcdir)/src/gallium/drivers/r300/compiler
 r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES)
 
 libr300_la_SOURCES = $(C_SOURCES)
 
-# These two files are included in libmesagallium, which is included in the dri
-# targets. So, they were added directly to r300g the dri-r300 target would have
-# duplicated symbols, and if they weren't the other *-r300 targets would fail
-# with undefined symbols.
-#
-# Solve this by building them into a separate helper library that can be linked
-# in place of libmesagallium.
-libr300_helper_la_CPPFLAGS = -I$(top_srcdir)/src
-libr300_helper_la_SOURCES = $(HELPER_SOURCES)
+EXTRA_DIST = \
+       compiler/tests/omod_two_writers.test \
+       compiler/tests/regalloc_tex_1d_swizzle.test \
+       meson.build