summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/i915/drm
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2011-08-22 11:09:20 +0800
committerChia-I Wu <olvaffe@gmail.com>2011-08-27 17:28:32 +0800
commit0cc088900725945bf381a07c8d85d1c8fdb447ac (patch)
tree15c16bfd98568c2aa477f7dfad6f433e33c85906 /src/gallium/winsys/i915/drm
parentf9b55e23aff663131b8814ec844e69b542eef5be (diff)
winsys/i915: share the source list
Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it.
Diffstat (limited to 'src/gallium/winsys/i915/drm')
-rw-r--r--src/gallium/winsys/i915/drm/Makefile7
-rw-r--r--src/gallium/winsys/i915/drm/Makefile.sources5
-rw-r--r--src/gallium/winsys/i915/drm/SConscript7
3 files changed, 8 insertions, 11 deletions
diff --git a/src/gallium/winsys/i915/drm/Makefile b/src/gallium/winsys/i915/drm/Makefile
index 1977de1fb09..37307ca8a4b 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 00000000000..1857442bf01
--- /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 15c97998fd8..3d276288105 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',