summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorChia-I Wu <[email protected]>2011-08-31 12:21:28 +0800
committerChia-I Wu <[email protected]>2011-09-01 10:53:30 +0800
commit47ba5c482f6c87971c8ad878dbfd9e7a4fc3e17c (patch)
tree1e4d6a6111a8617a7e0cdff8a67ed6d5e39b07cf /src/mesa
parent05fdb44dd7f2f4500e3d159df6519a644b5f09bc (diff)
i915: factor our source lists into Makefile.sources
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 build from breaking as often. Reviewed-by: Chad Versace <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i915/Makefile51
-rw-r--r--src/mesa/drivers/dri/i915/Makefile.sources49
2 files changed, 53 insertions, 47 deletions
diff --git a/src/mesa/drivers/dri/i915/Makefile b/src/mesa/drivers/dri/i915/Makefile
index 79e03f2f1d1..e2e5382b782 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 00000000000..8aee589cf88
--- /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