Mesa (master): scons: Unify state tracker SConscripts
Jakob Bornecrantz
wallbraker at kemper.freedesktop.org
Fri Nov 5 20:59:19 UTC 2010
Module: Mesa
Branch: master
Commit: f1600d3a9725803f0526fb3fd673787307539d27
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f1600d3a9725803f0526fb3fd673787307539d27
Author: Jakob Bornecrantz <jakob at vmware.com>
Date: Fri Nov 5 18:30:06 2010 +0000
scons: Unify state tracker SConscripts
---
src/gallium/state_trackers/dri/drm/SConscript | 16 +++++++++-------
src/gallium/state_trackers/dri/sw/SConscript | 16 +++++++++-------
src/gallium/state_trackers/glx/xlib/SConscript | 10 ++++++----
src/gallium/state_trackers/xorg/SConscript | 11 +++++++----
4 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/gallium/state_trackers/dri/drm/SConscript b/src/gallium/state_trackers/dri/drm/SConscript
index 90082ff..b188f76 100644
--- 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
--- 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
--- 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
--- 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')
More information about the mesa-commit
mailing list