diff options
| -rw-r--r-- | src/gallium/drivers/r300/Makefile.am | 13 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/Makefile.sources | 14 |
2 files changed, 15 insertions, 12 deletions
diff --git a/src/gallium/drivers/r300/Makefile.am b/src/gallium/drivers/r300/Makefile.am index 524df241743..4edeb47cb5e 100644 --- a/src/gallium/drivers/r300/Makefile.am +++ b/src/gallium/drivers/r300/Makefile.am @@ -3,7 +3,6 @@ include $(top_srcdir)/src/gallium/Automake.inc noinst_LTLIBRARIES = libr300.la libr300-helper.la check_PROGRAMS = r300_compiler_tests -testdir = compiler/tests TESTS = r300_compiler_tests AM_CFLAGS = \ @@ -22,13 +21,7 @@ r300_compiler_tests_LDADD = libr300.la libr300-helper.la \ $(GALLIUM_DRI_LIB_DEPS) 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_regalloc_tests.c \ - $(testdir)/radeon_compiler_util_tests.c \ - $(testdir)/rc_test_helpers.c \ - $(testdir)/unit_test.c +r300_compiler_tests_SOURCES = $(COMPILER_TESTS_SOURCES) libr300_la_SOURCES = $(C_SOURCES) @@ -39,6 +32,4 @@ libr300_la_SOURCES = $(C_SOURCES) # # Solve this by building them into a separate helper library that can be linked # in place of libmesagallium. -libr300_helper_la_SOURCES = \ - ralloc.c \ - register_allocate.c +libr300_helper_la_SOURCES = $(HELPER_SOURCES) diff --git a/src/gallium/drivers/r300/Makefile.sources b/src/gallium/drivers/r300/Makefile.sources index 10ceffbedfd..0e9ab52c2b1 100644 --- a/src/gallium/drivers/r300/Makefile.sources +++ b/src/gallium/drivers/r300/Makefile.sources @@ -1,4 +1,4 @@ -C_SOURCES = \ +C_SOURCES := \ r300_blit.c \ r300_chipset.c \ r300_context.c \ @@ -57,3 +57,15 @@ C_SOURCES = \ compiler/r3xx_vertprog.c \ compiler/r3xx_vertprog_dump.c \ compiler/memory_pool.c + +COMPILER_TESTS_SOURCES := \ + compiler/tests/r300_compiler_tests.c \ + compiler/tests/radeon_compiler_optimize_tests.c \ + compiler/tests/radeon_compiler_regalloc_tests.c \ + compiler/tests/radeon_compiler_util_tests.c \ + compiler/tests/rc_test_helpers.c \ + compiler/tests/unit_test.c + +HELPER_SOURCES := \ + ralloc.c \ + register_allocate.c |