scons: Unify state tracker SConscripts

diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 90082ff..b188f76 100644 (file)
--- a/src/gallium/state_trackers/dri/drm/SConscript
+++ b/src/gallium/state_trackers/dri/drm/SConscript
@@ -14,13 +14,15 @@ env.Append(CPPPATH = [
     '#/src/mesa/drivers/dri/common',
 ])
 
+sources = [
+    'dri_context.c',
+    'dri_drawable.c',
+    'dri_screen.c',
+    'dri2.c',
+]
+
 st_dri = env.ConvenienceLibrary(
     target = 'st_dri',
-    source = [ 'dri_context.c',
-               'dri_drawable.c',
-               'dri_screen.c',
-               'dri2.c',
-        ]
-    )
-
+    source = sources,
+)
 Export('st_dri')

diff --git a/src/gallium/state_trackers/dri/sw/SConscript b/src/gallium/state_trackers/dri/sw/SConscript
index 8646d27..d0c3efc 100644 (file)
--- a/src/gallium/state_trackers/dri/sw/SConscript
+++ b/src/gallium/state_trackers/dri/sw/SConscript
@@ -14,13 +14,15 @@ env.Append(CPPPATH = [
 
 env.Append(CPPDEFINES = [('__NOT_HAVE_DRM_H', '1')])
 
+sources = [
+    'dri_context.c',
+    'dri_drawable.c',
+    'dri_screen.c',
+    'drisw.c',
+]
+
 st_drisw = env.ConvenienceLibrary(
     target = 'st_drisw',
-    source = [ 'dri_context.c',
-               'dri_drawable.c',
-               'dri_screen.c',
-               'drisw.c',
-        ]
-    )
-
+    source = sources,
+)
 Export('st_drisw')

diff --git a/src/gallium/state_trackers/glx/xlib/SConscript b/src/gallium/state_trackers/glx/xlib/SConscript
index 0542a5f..9e7ebf3 100644 (file)
--- a/src/gallium/state_trackers/glx/xlib/SConscript
+++ b/src/gallium/state_trackers/glx/xlib/SConscript
@@ -11,14 +11,16 @@ env.Append(CPPPATH = [
     '#/src/mesa/main',
 ])
 
-st_xlib = env.ConvenienceLibrary(
-target = 'st_xlib',
-source = [
+sources = [
     'glx_api.c',
     'glx_getproc.c',
     'glx_usefont.c',
     'xm_api.c',
     'xm_st.c',
-    ]
+]
+
+st_xlib = env.ConvenienceLibrary(
+    target = 'st_xlib',
+    source = sources,
 )
 Export('st_xlib')

diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
index 1022954..1931569 100644 (file)
--- a/src/gallium/state_trackers/xorg/SConscript
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -21,9 +21,8 @@ if conf.CheckHeader('X11/extensions/dpmsconst.h'):
 
 conf.Finish()
 
-st_xorg = env.ConvenienceLibrary(
-target = 'st_xorg',
-source = [ 'xorg_composite.c',
+sources = [
+    'xorg_composite.c',
     'xorg_crtc.c',
     'xorg_dri2.c',
     'xorg_driver.c',
@@ -32,6 +31,10 @@ source = [ 'xorg_composite.c',
     'xorg_output.c',
     'xorg_renderer.c',
     'xorg_xv.c',
-    ]
+]
+
+st_xorg = env.ConvenienceLibrary(
+    target = 'st_xorg',
+    source = sources,
 )
 Export('st_xorg')