winsys/svga: share the source list

Factor out C_SOURCES from Makefile to Makefile.sources, and let Makefile
and SConscript share it.

diff --git a/src/gallium/winsys/svga/drm/Makefile b/src/gallium/winsys/svga/drm/Makefile
index c2f59e01b0d0a22c7f4cde6070830f11c09cd2eb..a378900f408b0c67b388540ceb5f8dce35eef1c5 100644 (file)
--- 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 (file)
index 0000000..c300860
--- /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 3e25c8aa7484ecac8e42cd93efee55838d996b4d..ee782c8b0310aa63a649e272e92b964ed2266877 100644 (file)
--- 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',