From 1025f11327cc5fb91a2dbd286ee0d7c00daaa8b3 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 22 Aug 2011 10:53:10 +0800 Subject: r300g: share the source list Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it. Note that $(TOP)/src/glsl/ralloc.c and $(TOP)/src/mesa/program/register_allocate.c are removed from C_SOURCES in Makefile.sources and added back in Makefile and SConscript. The idea is that they are not part of r300g. But having them in libr300.a makes build non-GL targets such as the compiler tests or g3dvl much easier. Also, for practical reason, TOP would be an undefined variable in Makefile.sources. --- src/gallium/drivers/r300/SConscript | 57 +------------------------------------ 1 file changed, 1 insertion(+), 56 deletions(-) (limited to 'src/gallium/drivers/r300/SConscript') diff --git a/src/gallium/drivers/r300/SConscript b/src/gallium/drivers/r300/SConscript index 7ffd1c27c96..e6a05db64f1 100644 --- a/src/gallium/drivers/r300/SConscript +++ b/src/gallium/drivers/r300/SConscript @@ -10,62 +10,7 @@ env.Append(CPPPATH = [ r300 = env.ConvenienceLibrary( target = 'r300', - source = [ - 'r300_blit.c', - 'r300_chipset.c', - 'r300_context.c', - 'r300_debug.c', - '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_vs.c', - 'r300_vs_draw.c', - 'r300_texture.c', - 'r300_texture_desc.c', - 'r300_tgsi_to_rc.c', - 'r300_transfer.c', - 'compiler/radeon_code.c', - 'compiler/radeon_compiler.c', - 'compiler/radeon_compiler_util.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_optimize.c', - 'compiler/radeon_remove_constants.c', - 'compiler/radeon_rename_regs.c', - 'compiler/radeon_emulate_branches.c', - 'compiler/radeon_emulate_loops.c', - 'compiler/radeon_dataflow.c', - 'compiler/radeon_dataflow_deadcode.c', - 'compiler/radeon_dataflow_swizzles.c', - 'compiler/radeon_variable.c', - 'compiler/radeon_list.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', + source = env.ParseSourceList('Makefile.sources', 'C_SOURCES') + [ '#/src/glsl/ralloc.c', '#/src/mesa/program/register_allocate.c' ]) -- cgit v1.2.3