scons: move SConscript from gallium/targets/ to mesa/drivers/dri/common/

Store scons side by side with the other build systems.

v2: cleanup after a failed rebase

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>

diff --git a/src/gallium/SConscript b/src/gallium/SConscript
index c68519d..6e27be2 100644 (file)
--- a/src/gallium/SConscript
+++ b/src/gallium/SConscript
@@ -124,7 +124,6 @@ if not env['embedded']:
 
     if env['dri']:
         SConscript([
-            'targets/SConscript.dri',
             'targets/dri-swrast/SConscript',
             'targets/dri-vmwgfx/SConscript',
         ])

diff --git a/src/mesa/drivers/SConscript b/src/mesa/drivers/SConscript
index 86aa868..9888e33 100644 (file)
--- a/src/mesa/drivers/SConscript
+++ b/src/mesa/drivers/SConscript
@@ -6,7 +6,10 @@ if env['x11']:
     SConscript('x11/SConscript')
 
 if env['dri']:
-    SConscript('dri/common/xmlpool/SConscript')
+    SConscript([
+        'dri/common/xmlpool/SConscript',
+        'dri/common/SConscript',
+    ])
 
 if env['platform'] == 'windows':
     SConscript('windows/gdi/SConscript')

diff --git a/src/gallium/targets/SConscript.dri b/src/mesa/drivers/dri/common/SConscript
similarity index 100%
rename from src/gallium/targets/SConscript.dri
rename to src/mesa/drivers/dri/common/SConscript