fontconfig libxcb/xcb-proto mesa xkeyboard-config git update 22 Aug 2014

libxcb/xcb-proto commit 8e3db42d67a0035bb16d16da28bd5eea7a269178
xkeyboard-config commit 10fce2c2baae471795d069f3a5f1307eedb9ff0a
fontconfig       commit 286cdc9c10b0453c25950103b6a1f7170d15bfdc
mesa             commit 97d03b9366bfa55b27feb92aa5afacd9c5f6f421

1 files changed, 11 insertions, 31 deletions

diff --git a/mesalib/src/gallium/SConscript b/mesalib/src/gallium/SConscript
index cb6172007..98d017e4d 100644
--- a/mesalib/src/gallium/SConscript
+++ b/mesalib/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',
         ])