Merge branch 'master' of git://anongit.freedesktop.org/mesa/mesa

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

diff --git a/src/gallium/drivers/r300/Makefile b/src/gallium/drivers/r300/Makefile
index a6529b206046a1772a180cbb1289c8d77c18d250..4f021276a8f6d1575e3549e328406a37c07305a2 100644 (file)
--- a/src/gallium/drivers/r300/Makefile
+++ b/src/gallium/drivers/r300/Makefile
@@ -11,28 +11,66 @@ C_SOURCES = \
        r300_emit.c \
        r300_flush.c \
        r300_fs.c \
+       r300_hyperz.c \
        r300_query.c \
        r300_render.c \
+       r300_render_stencilref.c \
+       r300_render_translate.c \
+       r300_resource.c \
        r300_screen.c \
        r300_screen_buffer.c \
        r300_state.c \
        r300_state_derived.c \
-       r300_state_invariant.c \
        r300_vs.c \
+       r300_vs_draw.c \
        r300_texture.c \
+       r300_texture_desc.c \
        r300_tgsi_to_rc.c \
-       r300_transfer.c
+       r300_transfer.c \
+       \
+       compiler/radeon_code.c \
+       compiler/radeon_compiler.c \
+       compiler/radeon_compiler_util.c \
+       compiler/radeon_emulate_branches.c \
+       compiler/radeon_emulate_loops.c \
+       compiler/radeon_program.c \
+       compiler/radeon_program_print.c \
+       compiler/radeon_opcodes.c \
+       compiler/radeon_program_alu.c \
+       compiler/radeon_program_pair.c \
+       compiler/radeon_program_tex.c \
+       compiler/radeon_pair_translate.c \
+       compiler/radeon_pair_schedule.c \
+       compiler/radeon_pair_regalloc.c \
+       compiler/radeon_pair_dead_sources.c \
+       compiler/radeon_dataflow.c \
+       compiler/radeon_dataflow_deadcode.c \
+       compiler/radeon_dataflow_swizzles.c \
+       compiler/radeon_list.c \
+       compiler/radeon_optimize.c \
+       compiler/radeon_remove_constants.c \
+       compiler/radeon_rename_regs.c \
+       compiler/radeon_variable.c \
+       compiler/r3xx_fragprog.c \
+       compiler/r300_fragprog.c \
+       compiler/r300_fragprog_swizzle.c \
+       compiler/r300_fragprog_emit.c \
+       compiler/r500_fragprog.c \
+       compiler/r500_fragprog_emit.c \
+       compiler/r3xx_vertprog.c \
+       compiler/r3xx_vertprog_dump.c \
+       compiler/memory_pool.c \
+       \
+       $(TOP)/src/glsl/ralloc.c \
+       $(TOP)/src/mesa/program/register_allocate.c
 
-LIBRARY_INCLUDES = \
-       -I$(TOP)/src/mesa/drivers/dri/r300/compiler \
-       -I$(TOP)/src/gallium/winsys/drm/radeon/core
-
-COMPILER_ARCHIVE = $(TOP)/src/mesa/drivers/dri/r300/compiler/libr300compiler.a
 
-EXTRA_OBJECTS = \
-       $(COMPILER_ARCHIVE)
+LIBRARY_INCLUDES = \
+       -I$(TOP)/include \
+       -I$(TOP)/src/mesa \
+       -I$(TOP)/src/glsl
 
 include ../../Makefile.template
 
-$(COMPILER_ARCHIVE):
-       $(MAKE) -C $(TOP)/src/mesa/drivers/dri/r300/compiler
+test: default
+       @$(MAKE) -s -C compiler/tests/