Remove talloc from the SCons build system.

[mesa.git] / src / gallium / targets / SConscript.dri

diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 4bbb16c227244db1e00fd4cfb082555461bb35c2..101863a68489c3dd9775da2b04bd4b793e3d811c 100644 (file)
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -3,67 +3,71 @@
 
 Import('*')
 
+if not env['dri']:
+    Return()
+
 drienv = env.Clone()
 
 drienv.Replace(CPPPATH = [
-       '#src/mesa/drivers/dri/common',
-       '#include',
-       '#include/GL/internal',
-       '#src/mapi',
-       '#src/gallium/include',
-       '#src/gallium/auxiliary',
-       '#src/gallium/drivers',
-       '#src/mesa',
-       '#src/mesa/main',
-       '#src/mesa/glapi',
-       '#src/mesa/math',
-       '#src/mesa/transform',
-       '#src/mesa/shader',
-       '#src/mesa/swrast',
-       '#src/mesa/swrast_setup',
-       '#src/egl/main',
-       '#src/egl/drivers/dri',
+    '#src/mesa/drivers/dri/common',
+    '#include',
+    '#include/GL/internal',
+    '#src/mapi',
+    '#src/gallium/include',
+    '#src/gallium/auxiliary',
+    '#src/gallium/drivers',
+    '#src/gallium/winsys',
+    '#src/mesa',
+    '#src/mesa/main',
+    '#src/mesa/glapi',
+    '#src/mesa/math',
+    '#src/mesa/transform',
+    '#src/mesa/shader',
+    '#src/mesa/swrast',
+    '#src/mesa/swrast_setup',
+    '#src/egl/main',
+    '#src/egl/drivers/dri',
 ])
 
 drienv.ParseConfig('pkg-config --cflags --libs libdrm')
 
 dri_common_utils = drienv.SharedObject(
-       target = 'utils.o',
-       source = '#src/mesa/drivers/dri/common/utils.c'
+    target = 'utils.o',
+    source = '#src/mesa/drivers/dri/common/utils.c'
 )
 
 dri_common_xmlconfig = drienv.SharedObject(
-       target = 'xmlconfig.o',
-       source = '#src/mesa/drivers/dri/common/xmlconfig.c'
+    target = 'xmlconfig.o',
+    source = '#src/mesa/drivers/dri/common/xmlconfig.c'
 )
 
 dri_common_vblank = drienv.SharedObject(
-       target = 'vblank.o',
-       source = '#src/mesa/drivers/dri/common/vblank.c'
+    target = 'vblank.o',
+    source = '#src/mesa/drivers/dri/common/vblank.c'
 )
 
 dri_common_dri_util = drienv.SharedObject(
-       target = 'dri_util.o',
-       source = '#src/mesa/drivers/dri/common/dri_util.c'
+    target = 'dri_util.o',
+    source = '#src/mesa/drivers/dri/common/dri_util.c'
 )
 
 dri_common_drisw_util = drienv.SharedObject(
-       target = 'drisw_util.o',
-       source = '#src/mesa/drivers/dri/common/drisw_util.c'
+    target = 'drisw_util.o',
+    source = '#src/mesa/drivers/dri/common/drisw_util.c'
 )
 
 
 COMMON_DRI_SW_OBJECTS = [
-       dri_common_utils,
-       dri_common_xmlconfig,
-       dri_common_drisw_util,
+    dri_common_utils,
+    dri_common_xmlconfig,
+    dri_common_drisw_util,
 ]
 
 COMMON_DRI_DRM_OBJECTS = [
-       dri_common_utils,
-       dri_common_xmlconfig,
-       dri_common_vblank,
-       dri_common_dri_util,
+    dri_common_utils,
+    dri_common_xmlconfig,
+    dri_common_vblank,
+    dri_common_dri_util,
 ]
 
 drienv.AppendUnique(LIBS = [
@@ -71,31 +75,7 @@ drienv.AppendUnique(LIBS = [
 ])
 
 Export([
-       'drienv',
-       'COMMON_DRI_SW_OBJECTS',
-       'COMMON_DRI_DRM_OBJECTS',
-])
-
-SConscript([
-       'dri-swrast/SConscript',
+    'drienv',
+    'COMMON_DRI_SW_OBJECTS',
+    'COMMON_DRI_DRM_OBJECTS',
 ])
-
-if 'vmware' in env['winsys']:
-       SConscript([
-               'dri-vmwgfx/SConscript',
-       ])
-
-if 'i915' in env['winsys']:
-       SConscript([
-               'dri-i915/SConscript',
-       ])
-
-if 'i965' in env['winsys']:
-       SConscript([
-               'dri-i965/SConscript',
-       ])
-
-if 'radeon' in env['winsys']:
-       SConscript([
-               'dri-radeong/SConscript',
-       ])