X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2FMakefile.am;h=26c75be32715375dc7f0856aa2e53cd65b9ff76f;hb=fda7683726a55eec8a76416470cd59d673b27790;hp=8aa6707c17506f5c375c19eb3c81732767bb5f1f;hpb=7dac1b470a9c1c977f79ecc301407681e200bd1a;p=mesa.git

diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am
index 8aa6707c175..26c75be3271 100644
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -1,9 +1,8 @@
-AUTOMAKE_OPTIONS = subdir-objects
-
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
+	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/mesa/program \
 	-I$(top_srcdir)/src/mesa \
 	-I$(top_srcdir)/src/glsl \
@@ -12,24 +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 \
-	$(GALLIUM_DRI_LIB_DEPS)
+	$(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_SOURCES = $(HELPER_SOURCES)
+EXTRA_DIST = \
+	compiler/tests/omod_two_writers.test \
+	compiler/tests/regalloc_tex_1d_swizzle.test \
+	meson.build