From 601498ae73e654c2de997ea75075613a694d604d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Fonseca?= <jfonseca@vmware.com>
Date: Mon, 1 Nov 2010 13:30:22 +0000
Subject: 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.
---
 src/gallium/tests/graw/SConscript | 26 ++++++++++++--------------
 src/gallium/tests/unit/SConscript |  4 ++--
 2 files changed, 14 insertions(+), 16 deletions(-)

(limited to 'src/gallium/tests')

diff --git a/src/gallium/tests/graw/SConscript b/src/gallium/tests/graw/SConscript
index ffde619..3341b88 100644
--- a/src/gallium/tests/graw/SConscript
+++ b/src/gallium/tests/graw/SConscript
@@ -1,20 +1,17 @@
 Import('*')
 
-try:
-    graw
-except NameError:
-    print 'warning: graw library not avaiable: skipping build of graw test'
-    Return()
-
 env = env.Clone()
 
+env.Prepend(LIBS = [gallium])
+
 env.Prepend(LIBPATH = [graw.dir])
-env.Prepend(LIBS = ['graw'] + gallium)
+env.Prepend(LIBS = ['graw'])
+    
 
-if platform in ('freebsd8', 'sunos5'):
+if env['platform'] in ('freebsd8', 'sunos5'):
     env.Append(LIBS = ['m'])
 
-if platform == 'freebsd8':
+if env['platform'] == 'freebsd8':
     env.Append(LIBS = ['pthread'])
 
 progs = [
@@ -29,9 +26,10 @@ progs = [
     'tri-gs',
 ]
 
-for prog in progs:
-    env.Program(
-        target = prog,
-        source = prog + '.c',
+for name in progs:
+    program = env.Program(
+        target = name,
+        source = name + '.c',
     )
-
+    #env.Depends(program, graw)
+    env.Alias('graw-progs', program)
diff --git a/src/gallium/tests/unit/SConscript b/src/gallium/tests/unit/SConscript
index 359759e..655e8a9 100644
--- a/src/gallium/tests/unit/SConscript
+++ b/src/gallium/tests/unit/SConscript
@@ -4,10 +4,10 @@ env = env.Clone()
 
 env.Prepend(LIBS = [gallium])
 
-if platform in ('freebsd8', 'sunos5'):
+if env['platform'] in ('freebsd8', 'sunos5'):
     env.Append(LIBS = ['m'])
 
-if platform == 'freebsd8':
+if env['platform'] == 'freebsd8':
     env.Append(LIBS = ['pthread'])
 
 progs = [
-- 
cgit v1.1