Mesa (master): winsys/i915: share the source list
Chia-I Wu
olv at kemper.freedesktop.org
Sat Aug 27 09:57:10 UTC 2011
Module: Mesa
Branch: master
Commit: 0cc088900725945bf381a07c8d85d1c8fdb447ac
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=0cc088900725945bf381a07c8d85d1c8fdb447ac
Author: Chia-I Wu <olv at lunarg.com>
Date: Mon Aug 22 11:09:20 2011 +0800
winsys/i915: share the source list
Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.
---
src/gallium/winsys/i915/drm/Makefile | 7 ++-----
src/gallium/winsys/i915/drm/Makefile.sources | 5 +++++
src/gallium/winsys/i915/drm/SConscript | 7 +------
3 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/src/gallium/winsys/i915/drm/Makefile b/src/gallium/winsys/i915/drm/Makefile
index 1977de1..37307ca 100644
--- a/src/gallium/winsys/i915/drm/Makefile
+++ b/src/gallium/winsys/i915/drm/Makefile
@@ -3,11 +3,8 @@ include $(TOP)/configs/current
LIBNAME = i915drm
-C_SOURCES = \
- i915_drm_batchbuffer.c \
- i915_drm_buffer.c \
- i915_drm_fence.c \
- i915_drm_winsys.c
+# get C_SOURCES
+include Makefile.sources
LIBRARY_INCLUDES = $(shell pkg-config libdrm --cflags-only-I)
diff --git a/src/gallium/winsys/i915/drm/Makefile.sources b/src/gallium/winsys/i915/drm/Makefile.sources
new file mode 100644
index 0000000..1857442
--- /dev/null
+++ b/src/gallium/winsys/i915/drm/Makefile.sources
@@ -0,0 +1,5 @@
+C_SOURCES := \
+ i915_drm_batchbuffer.c \
+ i915_drm_buffer.c \
+ i915_drm_fence.c \
+ i915_drm_winsys.c
diff --git a/src/gallium/winsys/i915/drm/SConscript b/src/gallium/winsys/i915/drm/SConscript
index 15c9799..3d27628 100644
--- a/src/gallium/winsys/i915/drm/SConscript
+++ b/src/gallium/winsys/i915/drm/SConscript
@@ -4,12 +4,7 @@ env = env.Clone()
env.PkgUseModules('DRM')
-i915drm_sources = [
- 'i915_drm_batchbuffer.c',
- 'i915_drm_buffer.c',
- 'i915_drm_fence.c',
- 'i915_drm_winsys.c',
-]
+i915drm_sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
i915drm = env.ConvenienceLibrary(
target ='i915drm',
More information about the mesa-commit
mailing list