X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2FSConscript;h=98ba88588d54d516570f31c124fa42f407d5edf7;hb=36bd3e986830bbf7435389cdd68e593b8b43f234;hp=9b9011f7f01c69ad0b3f41af613116ebf951707e;hpb=3acd7a34ab05b87521b74f626ec637e7fdcc6595;p=mesa.git

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index 9b9011f7f01..98ba88588d5 100644
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -1,10 +1,11 @@
 Import('env')
 
-# 
+#
 # Auxiliary modules
 #
 
 SConscript('auxiliary/SConscript')
+SConscript('auxiliary/pipe-loader/SConscript')
 
 #
 # Drivers
@@ -12,12 +13,9 @@ SConscript('auxiliary/SConscript')
 
 # These are common and work across all platforms
 SConscript([
-    'drivers/galahad/SConscript',
     'drivers/llvmpipe/SConscript',
-    'drivers/rbug/SConscript',
     'drivers/softpipe/SConscript',
     'drivers/svga/SConscript',
-    'drivers/trace/SConscript',
 ])
 
 #
@@ -39,59 +37,20 @@ if env['platform'] == 'windows':
         'winsys/sw/gdi/SConscript',
     ])
 
-if env['platform'] == 'haiku':
-    SConscript([
-        'winsys/sw/hgl/SConscript',
-    ])
-
-if env['dri']:
-    SConscript([
-        'winsys/sw/dri/SConscript',
-        'winsys/sw/kms-dri/SConscript',
-        'winsys/svga/drm/SConscript',
-    ])
-
 
 #
-# State trackers and targets
+# Frontends and targets
 #
 
-SConscript([
-    'targets/graw-null/SConscript',
-])
-
 if not env['embedded']:
     if env['x11']:
         SConscript([
-            'state_trackers/glx/xlib/SConscript',
-            'targets/graw-xlib/SConscript',
+            'frontends/glx/xlib/SConscript',
             'targets/libgl-xlib/SConscript',
         ])
 
     if env['platform'] == 'windows':
         SConscript([
-            'state_trackers/wgl/SConscript',
-            'targets/graw-gdi/SConscript',
+            'frontends/wgl/SConscript',
             'targets/libgl-gdi/SConscript',
         ])
-
-    if env['platform'] == 'haiku':
-        SConscript([
-            'state_trackers/hgl/SConscript',
-            'targets/haiku-softpipe/SConscript',
-        ])
-
-    if env['dri']:
-        SConscript([
-            'state_trackers/dri/SConscript',
-            'targets/dri/SConscript',
-        ])
-
-
-#
-# Unit tests & tools
-#
-
-if not env['embedded']:
-    SConscript('tests/unit/SConscript')
-    SConscript('tests/graw/SConscript')