From d2f10d8267407b58cac989ad4c57cdbe7ec5d564 Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Mon, 22 Aug 2011 11:16:33 +0800 Subject: [PATCH] svga: share the source list Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it. --- src/gallium/drivers/svga/Makefile | 50 +---------------------- src/gallium/drivers/svga/Makefile.sources | 47 +++++++++++++++++++++ src/gallium/drivers/svga/SConscript | 50 +---------------------- 3 files changed, 50 insertions(+), 97 deletions(-) create mode 100644 src/gallium/drivers/svga/Makefile.sources diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile index 27287793bda..97f68f06f47 100644 --- a/src/gallium/drivers/svga/Makefile +++ b/src/gallium/drivers/svga/Makefile @@ -3,54 +3,8 @@ include $(TOP)/configs/current LIBNAME = svga -C_SOURCES = \ - svgadump/svga_shader_dump.c \ - svgadump/svga_shader_op.c \ - svgadump/svga_dump.c \ - svga_cmd.c \ - svga_context.c \ - svga_draw.c \ - svga_draw_arrays.c \ - svga_draw_elements.c \ - svga_pipe_blend.c \ - svga_pipe_blit.c \ - svga_pipe_clear.c \ - svga_pipe_constants.c \ - svga_pipe_depthstencil.c \ - svga_pipe_draw.c \ - svga_pipe_flush.c \ - svga_pipe_fs.c \ - svga_pipe_misc.c \ - svga_pipe_query.c \ - svga_pipe_rasterizer.c \ - svga_pipe_sampler.c \ - svga_pipe_vertex.c \ - svga_pipe_vs.c \ - svga_screen.c \ - svga_screen_cache.c \ - svga_state.c \ - svga_state_need_swtnl.c \ - svga_state_constants.c \ - svga_state_framebuffer.c \ - svga_state_rss.c \ - svga_state_tss.c \ - svga_state_vdecl.c \ - svga_state_fs.c \ - svga_state_vs.c \ - svga_swtnl_backend.c \ - svga_swtnl_draw.c \ - svga_swtnl_state.c \ - svga_tgsi.c \ - svga_tgsi_decl_sm20.c \ - svga_tgsi_decl_sm30.c \ - svga_tgsi_insn.c \ - svga_sampler_view.c \ - svga_surface.c \ - svga_resource.c \ - svga_resource_texture.c \ - svga_resource_buffer.c \ - svga_resource_buffer_upload.c - +# get C_SOURCES +include Makefile.sources LIBRARY_INCLUDES = \ -I$(TOP)/src/gallium/drivers/svga/include diff --git a/src/gallium/drivers/svga/Makefile.sources b/src/gallium/drivers/svga/Makefile.sources new file mode 100644 index 00000000000..a4c4a441f8d --- /dev/null +++ b/src/gallium/drivers/svga/Makefile.sources @@ -0,0 +1,47 @@ +C_SOURCES := \ + svgadump/svga_shader_dump.c \ + svgadump/svga_shader_op.c \ + svgadump/svga_dump.c \ + svga_cmd.c \ + svga_context.c \ + svga_draw.c \ + svga_draw_arrays.c \ + svga_draw_elements.c \ + svga_pipe_blend.c \ + svga_pipe_blit.c \ + svga_pipe_clear.c \ + svga_pipe_constants.c \ + svga_pipe_depthstencil.c \ + svga_pipe_draw.c \ + svga_pipe_flush.c \ + svga_pipe_fs.c \ + svga_pipe_misc.c \ + svga_pipe_query.c \ + svga_pipe_rasterizer.c \ + svga_pipe_sampler.c \ + svga_pipe_vertex.c \ + svga_pipe_vs.c \ + svga_screen.c \ + svga_screen_cache.c \ + svga_state.c \ + svga_state_need_swtnl.c \ + svga_state_constants.c \ + svga_state_framebuffer.c \ + svga_state_rss.c \ + svga_state_tss.c \ + svga_state_vdecl.c \ + svga_state_fs.c \ + svga_state_vs.c \ + svga_swtnl_backend.c \ + svga_swtnl_draw.c \ + svga_swtnl_state.c \ + svga_tgsi.c \ + svga_tgsi_decl_sm20.c \ + svga_tgsi_decl_sm30.c \ + svga_tgsi_insn.c \ + svga_sampler_view.c \ + svga_surface.c \ + svga_resource.c \ + svga_resource_texture.c \ + svga_resource_buffer.c \ + svga_resource_buffer_upload.c diff --git a/src/gallium/drivers/svga/SConscript b/src/gallium/drivers/svga/SConscript index 5455ed07573..87903d89010 100644 --- a/src/gallium/drivers/svga/SConscript +++ b/src/gallium/drivers/svga/SConscript @@ -18,55 +18,7 @@ env.Prepend(CPPPATH = [ env.Append(CPPDEFINES = [ ]) -sources = [ - 'svga_cmd.c', - 'svga_context.c', - 'svga_draw.c', - 'svga_draw_arrays.c', - 'svga_draw_elements.c', - 'svga_pipe_blend.c', - 'svga_pipe_blit.c', - 'svga_pipe_clear.c', - 'svga_pipe_constants.c', - 'svga_pipe_depthstencil.c', - 'svga_pipe_draw.c', - 'svga_pipe_flush.c', - 'svga_pipe_fs.c', - 'svga_pipe_misc.c', - 'svga_pipe_query.c', - 'svga_pipe_rasterizer.c', - 'svga_pipe_sampler.c', - 'svga_pipe_vertex.c', - 'svga_pipe_vs.c', - 'svga_resource.c', - 'svga_resource_buffer.c', - 'svga_resource_buffer_upload.c', - 'svga_resource_texture.c', - 'svga_sampler_view.c', - 'svga_screen.c', - 'svga_screen_cache.c', - 'svga_state.c', - 'svga_state_constants.c', - 'svga_state_framebuffer.c', - 'svga_state_need_swtnl.c', - 'svga_state_rss.c', - 'svga_state_tss.c', - 'svga_state_vdecl.c', - 'svga_state_fs.c', - 'svga_state_vs.c', - 'svga_surface.c', - 'svga_swtnl_backend.c', - 'svga_swtnl_draw.c', - 'svga_swtnl_state.c', - 'svga_tgsi.c', - 'svga_tgsi_decl_sm20.c', - 'svga_tgsi_decl_sm30.c', - 'svga_tgsi_insn.c', - - 'svgadump/svga_dump.c', - 'svgadump/svga_shader_dump.c', - 'svgadump/svga_shader_op.c', -] +sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES') svga = env.ConvenienceLibrary( target = 'svga',