llvmpipe: consolidate C sources list into Makefile.sources

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>

diff --git a/src/gallium/drivers/llvmpipe/Makefile.am b/src/gallium/drivers/llvmpipe/Makefile.am
index 9059053b44297cf402256a73befdadc6372d5a17..f24bf719b14fa376da942f7436ef1eec59ce315f 100644 (file)
--- a/src/gallium/drivers/llvmpipe/Makefile.am
+++ b/src/gallium/drivers/llvmpipe/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CPPFLAGS = \
@@ -31,48 +32,7 @@ AM_CXXFLAGS= $(LLVM_CXXFLAGS)
 
 noinst_LTLIBRARIES = libllvmpipe.la
 
-libllvmpipe_la_SOURCES = \
-       lp_bld_alpha.c \
-       lp_bld_blend.c \
-       lp_bld_blend_aos.c \
-       lp_bld_blend_logicop.c \
-       lp_bld_depth.c \
-       lp_bld_interp.c \
-       lp_clear.c \
-       lp_context.c \
-       lp_draw_arrays.c \
-       lp_fence.c \
-       lp_flush.c \
-       lp_jit.c \
-       lp_memory.c \
-       lp_perf.c \
-       lp_query.c \
-       lp_rast.c \
-       lp_rast_debug.c \
-       lp_rast_tri.c \
-       lp_scene.c \
-       lp_scene_queue.c \
-       lp_screen.c \
-       lp_setup.c \
-       lp_setup_line.c \
-       lp_setup_point.c \
-       lp_setup_tri.c \
-       lp_setup_vbuf.c \
-       lp_state_blend.c \
-       lp_state_clip.c \
-       lp_state_derived.c \
-       lp_state_fs.c \
-       lp_state_setup.c \
-       lp_state_gs.c \
-       lp_state_rasterizer.c \
-       lp_state_sampler.c \
-       lp_state_so.c \
-       lp_state_surface.c \
-       lp_state_vertex.c \
-       lp_state_vs.c \
-       lp_surface.c \
-       lp_tex_sample.c \
-       lp_texture.c
+libllvmpipe_la_SOURCES = $(C_SOURCES)
 
 libllvmpipe_la_LDFLAGS = $(LLVM_LDFLAGS)
 

diff --git a/src/gallium/drivers/llvmpipe/Makefile.sources b/src/gallium/drivers/llvmpipe/Makefile.sources
new file mode 100644 (file)
index 0000000..8a19acd
--- /dev/null
+++ b/src/gallium/drivers/llvmpipe/Makefile.sources
@@ -0,0 +1,42 @@
+C_SOURCES := \
+       lp_bld_alpha.c \
+       lp_bld_blend.c \
+       lp_bld_blend_aos.c \
+       lp_bld_blend_logicop.c \
+       lp_bld_depth.c \
+       lp_bld_interp.c \
+       lp_clear.c \
+       lp_context.c \
+       lp_draw_arrays.c \
+       lp_fence.c \
+       lp_flush.c \
+       lp_jit.c \
+       lp_memory.c \
+       lp_perf.c \
+       lp_query.c \
+       lp_rast.c \
+       lp_rast_debug.c \
+       lp_rast_tri.c \
+       lp_scene.c \
+       lp_scene_queue.c \
+       lp_screen.c \
+       lp_setup.c \
+       lp_setup_line.c \
+       lp_setup_point.c \
+       lp_setup_tri.c \
+       lp_setup_vbuf.c \
+       lp_state_blend.c \
+       lp_state_clip.c \
+       lp_state_derived.c \
+       lp_state_fs.c \
+       lp_state_setup.c \
+       lp_state_gs.c \
+       lp_state_rasterizer.c \
+       lp_state_sampler.c \
+       lp_state_so.c \
+       lp_state_surface.c \
+       lp_state_vertex.c \
+       lp_state_vs.c \
+       lp_surface.c \
+       lp_tex_sample.c \
+       lp_texture.c

diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript
index 22314c204f388696023393c36a377c230dd1fb6f..20500fd834ff41121c9bebae8c8f8b95999c18e3 100644 (file)
--- a/src/gallium/drivers/llvmpipe/SConscript
+++ b/src/gallium/drivers/llvmpipe/SConscript
@@ -11,49 +11,8 @@ env = env.Clone()
 
 llvmpipe = env.ConvenienceLibrary(
        target = 'llvmpipe',
-       source = [
-               'lp_bld_alpha.c',
-               'lp_bld_blend.c',
-               'lp_bld_blend_aos.c',
-               'lp_bld_blend_logicop.c',
-               'lp_bld_depth.c',
-               'lp_bld_interp.c',
-               'lp_clear.c',
-               'lp_context.c',
-               'lp_draw_arrays.c',
-               'lp_fence.c',
-               'lp_flush.c',
-               'lp_jit.c',
-               'lp_memory.c',
-               'lp_perf.c',
-               'lp_query.c',
-               'lp_rast.c',
-               'lp_rast_debug.c',
-               'lp_rast_tri.c',
-               'lp_scene.c',
-               'lp_scene_queue.c',
-               'lp_screen.c',
-               'lp_setup.c',
-               'lp_setup_line.c',
-               'lp_setup_point.c',
-               'lp_setup_tri.c',
-               'lp_setup_vbuf.c',
-               'lp_state_blend.c',
-               'lp_state_clip.c',
-               'lp_state_derived.c',
-               'lp_state_fs.c',
-               'lp_state_setup.c',
-               'lp_state_gs.c',
-               'lp_state_rasterizer.c',
-               'lp_state_sampler.c',
-                'lp_state_so.c',
-               'lp_state_surface.c',
-               'lp_state_vertex.c',
-               'lp_state_vs.c',
-               'lp_surface.c',
-               'lp_tex_sample.c',
-               'lp_texture.c'
-       ])
+       source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
+       )
 
 env.Alias('llvmpipe', llvmpipe)