ilo: add support for indirect access of CONST in FS

[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 3f39af3b1042d26ed0e8cc92eb66a5f5ad531b62..49264c4a719c168af8b4ccb639faa87e080309b6 100644 (file)
--- a/src/gallium/drivers/r300/Makefile.am
+++ b/src/gallium/drivers/r300/Makefile.am
@@ -1,7 +1,7 @@
 include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
-noinst_LTLIBRARIES = libr300.la
+noinst_LTLIBRARIES = libr300.la libr300-helper.la
 check_PROGRAMS = r300_compiler_tests
 testdir = compiler/tests
 TESTS = r300_compiler_tests
@@ -22,15 +22,20 @@ r300_compiler_tests_CPPFLAGS = \
        -I$(top_srcdir)/src/gallium/drivers/r300/compiler
 r300_compiler_tests_SOURCES = \
        $(testdir)/r300_compiler_tests.c \
+       $(testdir)/radeon_compiler_optimize_tests.c \
        $(testdir)/radeon_compiler_util_tests.c \
        $(testdir)/rc_test_helpers.c \
        $(testdir)/unit_test.c
 
-libr300_la_SOURCES = \
-       $(C_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 = \
        $(top_srcdir)/src/glsl/ralloc.c \
        $(top_srcdir)/src/mesa/program/register_allocate.c
-
-#XXX: Delete this when all r300 targets are converted to automake.
-all-local: libr300.la
-       ln -f $(builddir)/.libs/libr300.a $(builddir)/libr300.a