[Mesa-dev] [PATCH 14/14] scons: group state-trackers' and targets' scons

[Emil Velikov]

Both share the identical dependencies, as such we can simplify
the scons script.

Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
 src/gallium/SConscript | 42 +++++++++++-------------------------------
 1 file changed, 11 insertions(+), 31 deletions(-)

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index cb61720..98d017e 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -22,34 +22,14 @@ SConscript([
 ])
 
 #
-# State trackers
-#
-
-# Needed by some state trackers
-SConscript('winsys/sw/null/SConscript')
-
-if not env['embedded']:
-    SConscript('state_trackers/vega/SConscript')
-    if env['platform'] not in ('cygwin', 'darwin', 'haiku', 'sunos'):
-        SConscript('state_trackers/egl/SConscript')
-
-    if env['x11']:
-        SConscript('state_trackers/glx/xlib/SConscript')
-
-    if env['dri']:
-        SConscript('state_trackers/dri/SConscript')
-
-    if env['platform'] == 'windows':
-        SConscript('state_trackers/wgl/SConscript')
-
-#
 # Winsys
-# 
+#
 
 SConscript([
+    'winsys/sw/null/SConscript',
     'winsys/sw/wrapper/SConscript',
 ])
-    
+
 if env['x11']:
     SConscript([
         'winsys/sw/xlib/SConscript',
@@ -68,18 +48,13 @@ if env['platform'] == 'haiku':
 if env['dri']:
     SConscript([
         'winsys/sw/dri/SConscript',
-    ])
-
-    SConscript([
         'winsys/sw/kms-dri/SConscript',
-    ])
-
-    SConscript([
         'winsys/svga/drm/SConscript',
     ])
 
+
 #
-# Targets
+# State trackers and targets
 #
 
 SConscript([
@@ -87,19 +62,23 @@ SConscript([
 ])
 
 if not env['embedded']:
+    SConscript('state_trackers/vega/SConscript')
     if env['platform'] not in ('cygwin', 'darwin', 'freebsd', 'haiku', 'sunos'):
         SConscript([
-            'targets/egl-static/SConscript'
+            'state_trackers/egl/SConscript',
+            'targets/egl-static/SConscript',
         ])
 
     if env['x11']:
         SConscript([
+            'state_trackers/glx/xlib/SConscript',
             'targets/graw-xlib/SConscript',
             'targets/libgl-xlib/SConscript',
         ])
 
     if env['platform'] == 'windows':
         SConscript([
+            'state_trackers/wgl/SConscript',
             'targets/graw-gdi/SConscript',
             'targets/libgl-gdi/SConscript',
         ])
@@ -111,6 +90,7 @@ if not env['embedded']:
 
     if env['dri']:
         SConscript([
+            'state_trackers/dri/SConscript',
             'targets/dri/SConscript',
         ])
 
-- 
2.0.0