summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChia-I Wu <olv@lunarg.com>2011-08-22 11:18:15 +0800
committerChia-I Wu <olvaffe@gmail.com>2011-08-27 17:28:32 +0800
commitf9b55e23aff663131b8814ec844e69b542eef5be (patch)
treee7b89fdb3376600a748c2b65e27df5d0e4da34ed
parent11a56c430b84e97a10016045a2a0eeb126df88de (diff)
winsys/svga: share the source list
Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile and SConscript share it.
-rw-r--r--src/gallium/winsys/svga/drm/Makefile12
-rw-r--r--src/gallium/winsys/svga/drm/Makefile.sources10
-rw-r--r--src/gallium/winsys/svga/drm/SConscript12
3 files changed, 13 insertions, 21 deletions
diff --git a/src/gallium/winsys/svga/drm/Makefile b/src/gallium/winsys/svga/drm/Makefile
index c2f59e01b0d..a378900f408 100644
--- a/src/gallium/winsys/svga/drm/Makefile
+++ b/src/gallium/winsys/svga/drm/Makefile
@@ -3,16 +3,8 @@ include $(TOP)/configs/current
LIBNAME = svgadrm
-C_SOURCES = \
- vmw_buffer.c \
- vmw_context.c \
- vmw_fence.c \
- vmw_screen.c \
- vmw_screen_dri.c \
- vmw_screen_ioctl.c \
- vmw_screen_pools.c \
- vmw_screen_svga.c \
- vmw_surface.c
+# get C_SOURCES
+include Makefile.sources
LIBRARY_INCLUDES = \
-I$(TOP)/src/gallium/drivers/svga \
diff --git a/src/gallium/winsys/svga/drm/Makefile.sources b/src/gallium/winsys/svga/drm/Makefile.sources
new file mode 100644
index 00000000000..c300860ff79
--- /dev/null
+++ b/src/gallium/winsys/svga/drm/Makefile.sources
@@ -0,0 +1,10 @@
+C_SOURCES := \
+ vmw_buffer.c \
+ vmw_context.c \
+ vmw_fence.c \
+ vmw_screen.c \
+ vmw_screen_dri.c \
+ vmw_screen_ioctl.c \
+ vmw_screen_pools.c \
+ vmw_screen_svga.c \
+ vmw_surface.c
diff --git a/src/gallium/winsys/svga/drm/SConscript b/src/gallium/winsys/svga/drm/SConscript
index 3e25c8aa748..ee782c8b031 100644
--- a/src/gallium/winsys/svga/drm/SConscript
+++ b/src/gallium/winsys/svga/drm/SConscript
@@ -21,17 +21,7 @@ env.Prepend(CPPPATH = [
env.Append(CPPDEFINES = [
])
-sources = [
- 'vmw_buffer.c',
- 'vmw_context.c',
- 'vmw_fence.c',
- 'vmw_screen.c',
- 'vmw_screen_dri.c',
- 'vmw_screen_ioctl.c',
- 'vmw_screen_pools.c',
- 'vmw_screen_svga.c',
- 'vmw_surface.c',
-]
+sources = env.ParseSourceList('Makefile.sources', 'C_SOURCES')
svgadrm = env.ConvenienceLibrary(
target = 'svgadrm',