scons: Revamp how to specify targets to build.

Use scons target and dependency system instead of ad-hoc options.

Now is simply a matter of naming what to build. For example:

  scons libgl-xlib

  scons libgl-gdi

  scons graw-progs

  scons llvmpipe

and so on. And there is also the possibility of scepcified subdirs, e.g.

  scons src/gallium/drivers

If nothing is specified then everything will be build.

There might be some rough corners over the next days. Please bare with me.

1 files changed, 32 insertions, 31 deletions

diff --git a/src/gallium/state_trackers/xorg/SConscript b/src/gallium/state_trackers/xorg/SConscript
index 0b598dab6e3..ffaa1c26846 100644
--- a/src/gallium/state_trackers/xorg/SConscript
+++ b/src/gallium/state_trackers/xorg/SConscript
@@ -3,34 +3,35 @@
 
 Import('*')
 
-if 'xorg' in env['statetrackers']:
-
-    env = env.Clone()
-
-    env.Append(CPPPATH = [
-	'#/src/mesa',
-    ])
-
-    env.ParseConfig('pkg-config --cflags --libs libdrm xorg-server')
-
-    conf = env.Configure()
-
-    if conf.CheckHeader('X11/extensions/dpmsconst.h'):
-        env.Append(CPPDEFINES = [('HAVE_XEXTPROTO_71', '1')])
-
-    conf.Finish()
-
-    st_xorg = env.ConvenienceLibrary(
-	target = 'st_xorg',
-	source = [ 'xorg_composite.c',
-		'xorg_crtc.c',
-		'xorg_dri2.c',
-		'xorg_driver.c',
-		'xorg_exa.c',
-		'xorg_exa_tgsi.c',
-		'xorg_output.c',
-		'xorg_renderer.c',
-		'xorg_xv.c',
-		]
-    )
-    Export('st_xorg')
+if not env['x11'] or not env['dri'] or not env['xorg']:
+    Return()
+
+env = env.Clone()
+
+env.Append(CPPPATH = [
+    '#/src/mesa',
+])
+
+env.ParseConfig('pkg-config --cflags --libs libdrm xorg-server')
+
+conf = env.Configure()
+
+if conf.CheckHeader('X11/extensions/dpmsconst.h'):
+    env.Append(CPPDEFINES = [('HAVE_XEXTPROTO_71', '1')])
+
+conf.Finish()
+
+st_xorg = env.ConvenienceLibrary(
+target = 'st_xorg',
+source = [ 'xorg_composite.c',
+    'xorg_crtc.c',
+    'xorg_dri2.c',
+    'xorg_driver.c',
+    'xorg_exa.c',
+    'xorg_exa_tgsi.c',
+    'xorg_output.c',
+    'xorg_renderer.c',
+    'xorg_xv.c',
+    ]
+)
+Export('st_xorg')