[Mesa-dev] [PATCH 05/29] softpipe: consolidate C sources list into Makefile.sources

[Tom Stellard]

On Sun, Sep 22, 2013 at 09:29:28PM +0100, Emil Velikov wrote:
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>

As long as you have build tested these with both automake and scons and
are prepared to deal with any fallout once they are committed.

Patches 5 through 29 are:

Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

> ---
>  src/gallium/drivers/softpipe/Android.mk       | 33 ++------------------------
>  src/gallium/drivers/softpipe/Makefile.am      | 32 ++-----------------------
>  src/gallium/drivers/softpipe/Makefile.sources | 30 +++++++++++++++++++++++
>  src/gallium/drivers/softpipe/SConscript       | 34 +++------------------------
>  4 files changed, 37 insertions(+), 92 deletions(-)
>  create mode 100644 src/gallium/drivers/softpipe/Makefile.sources
> 
> diff --git a/src/gallium/drivers/softpipe/Android.mk b/src/gallium/drivers/softpipe/Android.mk
> index 6a125a5..5d3a93b 100644
> --- a/src/gallium/drivers/softpipe/Android.mk
> +++ b/src/gallium/drivers/softpipe/Android.mk
> @@ -23,37 +23,8 @@
>  
>  LOCAL_PATH := $(call my-dir)
>  
> -# from Makefile
> -C_SOURCES = \
> -	sp_fs_exec.c \
> -	sp_clear.c \
> -	sp_fence.c \
> -	sp_flush.c \
> -	sp_query.c \
> -	sp_context.c \
> -	sp_draw_arrays.c \
> -	sp_prim_vbuf.c \
> -	sp_quad_pipe.c \
> -	sp_quad_stipple.c \
> -	sp_quad_depth_test.c \
> -	sp_quad_fs.c \
> -	sp_quad_blend.c \
> -	sp_screen.c \
> -        sp_setup.c \
> -	sp_state_blend.c \
> -	sp_state_clip.c \
> -	sp_state_derived.c \
> -	sp_state_sampler.c \
> -	sp_state_shader.c \
> -	sp_state_so.c \
> -	sp_state_rasterizer.c \
> -	sp_state_surface.c \
> -	sp_state_vertex.c \
> -	sp_texture.c \
> -	sp_tex_sample.c \
> -	sp_tex_tile_cache.c \
> -	sp_tile_cache.c \
> -	sp_surface.c
> +# get C_SOURCES
> +include $(LOCAL_PATH)/Makefile.sources
>  
>  include $(CLEAR_VARS)
>  
> diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
> index 52ce958..432fe7d 100644
> --- a/src/gallium/drivers/softpipe/Makefile.am
> +++ b/src/gallium/drivers/softpipe/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 = \
> @@ -29,33 +30,4 @@ AM_CPPFLAGS = \
>  
>  noinst_LTLIBRARIES = libsoftpipe.la
>  
> -libsoftpipe_la_SOURCES = \
> -	sp_fs_exec.c \
> -	sp_clear.c \
> -	sp_fence.c \
> -	sp_flush.c \
> -	sp_query.c \
> -	sp_context.c \
> -	sp_draw_arrays.c \
> -	sp_prim_vbuf.c \
> -	sp_quad_pipe.c \
> -	sp_quad_stipple.c \
> -	sp_quad_depth_test.c \
> -	sp_quad_fs.c \
> -	sp_quad_blend.c \
> -	sp_screen.c \
> -	sp_setup.c \
> -	sp_state_blend.c \
> -	sp_state_clip.c \
> -	sp_state_derived.c \
> -	sp_state_sampler.c \
> -	sp_state_shader.c \
> -	sp_state_so.c \
> -	sp_state_rasterizer.c \
> -	sp_state_surface.c \
> -	sp_state_vertex.c \
> -	sp_texture.c \
> -	sp_tex_sample.c \
> -	sp_tex_tile_cache.c \
> -	sp_tile_cache.c \
> -	sp_surface.c
> +libsoftpipe_la_SOURCES = $(C_SOURCES)
> diff --git a/src/gallium/drivers/softpipe/Makefile.sources b/src/gallium/drivers/softpipe/Makefile.sources
> new file mode 100644
> index 0000000..8237bcf
> --- /dev/null
> +++ b/src/gallium/drivers/softpipe/Makefile.sources
> @@ -0,0 +1,30 @@
> +C_SOURCES := \
> +	sp_fs_exec.c \
> +	sp_clear.c \
> +	sp_fence.c \
> +	sp_flush.c \
> +	sp_query.c \
> +	sp_context.c \
> +	sp_draw_arrays.c \
> +	sp_prim_vbuf.c \
> +	sp_quad_pipe.c \
> +	sp_quad_stipple.c \
> +	sp_quad_depth_test.c \
> +	sp_quad_fs.c \
> +	sp_quad_blend.c \
> +	sp_screen.c \
> +	sp_setup.c \
> +	sp_state_blend.c \
> +	sp_state_clip.c \
> +	sp_state_derived.c \
> +	sp_state_sampler.c \
> +	sp_state_shader.c \
> +	sp_state_so.c \
> +	sp_state_rasterizer.c \
> +	sp_state_surface.c \
> +	sp_state_vertex.c \
> +	sp_texture.c \
> +	sp_tex_sample.c \
> +	sp_tex_tile_cache.c \
> +	sp_tile_cache.c \
> +	sp_surface.c
> diff --git a/src/gallium/drivers/softpipe/SConscript b/src/gallium/drivers/softpipe/SConscript
> index da2c93e..6768cbb 100644
> --- a/src/gallium/drivers/softpipe/SConscript
> +++ b/src/gallium/drivers/softpipe/SConscript
> @@ -2,39 +2,11 @@ Import('*')
>  
>  env = env.Clone()
>  
> +
>  softpipe = env.ConvenienceLibrary(
>  	target = 'softpipe',
> -	source = [
> -		'sp_fs_exec.c',
> -		'sp_clear.c',
> -		'sp_context.c',
> -		'sp_draw_arrays.c',
> -		'sp_fence.c',
> -		'sp_flush.c',
> -		'sp_prim_vbuf.c',
> -		'sp_setup.c',
> -		'sp_quad_blend.c',
> -		'sp_quad_pipe.c',
> -		'sp_quad_depth_test.c',
> -		'sp_quad_fs.c',
> -		'sp_quad_stipple.c',
> -		'sp_query.c',
> -		'sp_screen.c',
> -		'sp_state_blend.c',
> -		'sp_state_clip.c',
> -		'sp_state_derived.c',
> -		'sp_state_rasterizer.c',
> -		'sp_state_sampler.c',
> -		'sp_state_shader.c',
> -		'sp_state_so.c',
> -		'sp_state_surface.c',
> -		'sp_state_vertex.c',
> -		'sp_surface.c',
> -		'sp_tex_sample.c',
> -		'sp_tex_tile_cache.c',
> -		'sp_texture.c',
> -		'sp_tile_cache.c',
> -	])
> +	source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
> +	)
>  
>  env.Alias('softpipe', softpipe)
>  
> -- 
> 1.8.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev