[Mesa-dev] [PATCH 2/3] i915: factor our source lists into Makefile.sources

[Ian Romanick]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 08/30/2011 10:27 PM, Chia-I Wu wrote:
> From: Chia-I Wu <olv at lunarg.com>
> 
> In preparation for porting i915 to Android, factor its source lists into
> a shared makefile. This prevents duplication of source lists, and hence
> prevents the Android from breaking as often.

I think you meant "the Android build" in the commit message.

> ---
>  src/mesa/drivers/dri/i915/Makefile         |   51 ++-------------------------
>  src/mesa/drivers/dri/i915/Makefile.sources |   49 ++++++++++++++++++++++++++
>  2 files changed, 53 insertions(+), 47 deletions(-)
>  create mode 100644 src/mesa/drivers/dri/i915/Makefile.sources
> 
> diff --git a/src/mesa/drivers/dri/i915/Makefile b/src/mesa/drivers/dri/i915/Makefile
> index 79e03f2..e2e5382 100644
> --- a/src/mesa/drivers/dri/i915/Makefile
> +++ b/src/mesa/drivers/dri/i915/Makefile
> @@ -6,59 +6,16 @@ LIBNAME = i915_dri.so
>  
>  include ../Makefile.defines
>  
> -DRIVER_SOURCES = \
> -	i830_context.c \
> -	i830_state.c \
> -	i830_texblend.c \
> -	i830_texstate.c \
> -	i830_vtbl.c \
> -	intel_render.c \
> -	intel_regions.c \
> -	intel_buffer_objects.c \
> -	intel_batchbuffer.c \
> -	intel_clear.c \
> -	intel_extensions.c \
> -	intel_extensions_es2.c \
> -	intel_mipmap_tree.c \
> -	intel_tex_layout.c \
> -	intel_tex_image.c \
> -	intel_tex_subimage.c \
> -	intel_tex_copy.c \
> -	intel_tex_validate.c \
> -	intel_tex_format.c \
> -	intel_tex.c \
> -	intel_pixel.c \
> -	intel_pixel_bitmap.c \
> -	intel_pixel_copy.c \
> -	intel_pixel_draw.c \
> -	intel_pixel_read.c \
> -	intel_buffers.c \
> -	intel_blit.c \
> -	i915_tex_layout.c \
> -	i915_texstate.c \
> -	i915_context.c \
> -	i915_debug.c \
> -	i915_debug_fp.c \
> -	i915_fragprog.c \
> -	i915_program.c \
> -	i915_state.c \
> -	i915_vtbl.c \
> -	intel_context.c \
> -	intel_decode.c \
> -	intel_screen.c \
> -	intel_span.c \
> -	intel_state.c \
> -	intel_syncobj.c \
> -	intel_tris.c \
> -	intel_fbo.c
> +# Import variables i915_*.
> +include Makefile.sources
>  
>  C_SOURCES = \
>  	$(COMMON_SOURCES) \
> -	$(DRIVER_SOURCES)
> +	$(i915_C_SOURCES)
>  
>  ASM_SOURCES = 
>  
> -DRIVER_DEFINES = -I../intel -DI915 \
> +DRIVER_DEFINES = $(addprefix -I$(TOP)/, $(i915_INCLUDES)) -DI915 \
>  	$(shell pkg-config libdrm --atleast-version=2.3.1 \
>  				&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
>  
> diff --git a/src/mesa/drivers/dri/i915/Makefile.sources b/src/mesa/drivers/dri/i915/Makefile.sources
> new file mode 100644
> index 0000000..8aee589
> --- /dev/null
> +++ b/src/mesa/drivers/dri/i915/Makefile.sources
> @@ -0,0 +1,49 @@
> +# Paths are relative to TOP.
> +i915_INCLUDES := \
> +	src/mesa/drivers/dri/intel
> +
> +i915_C_SOURCES := \
> +	i830_context.c \
> +	i830_state.c \
> +	i830_texblend.c \
> +	i830_texstate.c \
> +	i830_vtbl.c \
> +	intel_render.c \
> +	intel_regions.c \
> +	intel_buffer_objects.c \
> +	intel_batchbuffer.c \
> +	intel_clear.c \
> +	intel_extensions.c \
> +	intel_extensions_es2.c \
> +	intel_mipmap_tree.c \
> +	intel_tex_layout.c \
> +	intel_tex_image.c \
> +	intel_tex_subimage.c \
> +	intel_tex_copy.c \
> +	intel_tex_validate.c \
> +	intel_tex_format.c \
> +	intel_tex.c \
> +	intel_pixel.c \
> +	intel_pixel_bitmap.c \
> +	intel_pixel_copy.c \
> +	intel_pixel_draw.c \
> +	intel_pixel_read.c \
> +	intel_buffers.c \
> +	intel_blit.c \
> +	i915_tex_layout.c \
> +	i915_texstate.c \
> +	i915_context.c \
> +	i915_debug.c \
> +	i915_debug_fp.c \
> +	i915_fragprog.c \
> +	i915_program.c \
> +	i915_state.c \
> +	i915_vtbl.c \
> +	intel_context.c \
> +	intel_decode.c \
> +	intel_screen.c \
> +	intel_span.c \
> +	intel_state.c \
> +	intel_syncobj.c \
> +	intel_tris.c \
> +	intel_fbo.c

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/

iEYEARECAAYFAk5e2TwACgkQX1gOwKyEAw/7xwCfclhnVKYoV1jl6ppU4HHl9DSZ
olMAn3xh8WY3Xlwt1eS6lc+Xz/SLhhwF
=DeAn
-----END PGP SIGNATURE-----