[Mesa-dev] [PATCH 1/4] r600g: share the source list

[Marek Olšák]

I took a quick look and the patches look good to me.

Reviewed-by: Marek Olšák <maraeo at gmail.com>

On Wed, Aug 24, 2011 at 5:08 AM, Chia-I Wu <olvaffe at gmail.com> wrote:
> Factor out C_SOURCES from Makefile to Makefile.sources, and let
> Makefile and SConscript share it.
> ---
>  src/gallium/drivers/r600/Makefile         |   17 ++---------------
>  src/gallium/drivers/r600/Makefile.sources |   15 +++++++++++++++
>  src/gallium/drivers/r600/SConscript       |   18 ++----------------
>  3 files changed, 19 insertions(+), 31 deletions(-)
>  create mode 100644 src/gallium/drivers/r600/Makefile.sources
>
> diff --git a/src/gallium/drivers/r600/Makefile b/src/gallium/drivers/r600/Makefile
> index 7e21e3e..0e68fe9 100644
> --- a/src/gallium/drivers/r600/Makefile
> +++ b/src/gallium/drivers/r600/Makefile
> @@ -6,20 +6,7 @@ LIBNAME = r600
>  LIBRARY_INCLUDES = \
>        $(shell pkg-config libdrm --cflags-only-I)
>
> -C_SOURCES = \
> -       r600_asm.c \
> -       r600_blit.c \
> -       r600_buffer.c \
> -       r600_pipe.c \
> -       r600_query.c \
> -       r600_resource.c \
> -       r600_shader.c \
> -       r600_state.c \
> -       r600_texture.c \
> -       r700_asm.c \
> -       evergreen_state.c \
> -       eg_asm.c \
> -       r600_translate.c \
> -       r600_state_common.c
> +# get C_SOURCES
> +include Makefile.sources
>
>  include ../../Makefile.template
> diff --git a/src/gallium/drivers/r600/Makefile.sources b/src/gallium/drivers/r600/Makefile.sources
> new file mode 100644
> index 0000000..0366394
> --- /dev/null
> +++ b/src/gallium/drivers/r600/Makefile.sources
> @@ -0,0 +1,15 @@
> +C_SOURCES := \
> +       r600_asm.c \
> +       r600_blit.c \
> +       r600_buffer.c \
> +       r600_pipe.c \
> +       r600_query.c \
> +       r600_resource.c \
> +       r600_shader.c \
> +       r600_state.c \
> +       r600_texture.c \
> +       r700_asm.c \
> +       evergreen_state.c \
> +       eg_asm.c \
> +       r600_translate.c \
> +       r600_state_common.c
> diff --git a/src/gallium/drivers/r600/SConscript b/src/gallium/drivers/r600/SConscript
> index 19f07b2..be12255 100644
> --- a/src/gallium/drivers/r600/SConscript
> +++ b/src/gallium/drivers/r600/SConscript
> @@ -11,22 +11,8 @@ env.Append(CPPPATH = [
>
>  r600 = env.ConvenienceLibrary(
>     target = 'r600',
> -    source = [
> -        'r600_asm.c',
> -        'r600_buffer.c',
> -        'r600_blit.c',
> -        'r600_pipe.c',
> -        'r600_query.c',
> -        'r600_resource.c',
> -        'r600_shader.c',
> -        'r600_state.c',
> -        'r600_state_common.c',
> -        'r600_texture.c',
> -        'r600_translate.c',
> -        'r700_asm.c',
> -        'evergreen_state.c',
> -        'eg_asm.c',
> -    ])
> +    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
> +    )
>
>  env.Alias('r600', r600)
>
> --
> 1.7.5.4
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>