From 27c0c5072894fbe8d1b9984cda4d519a6f417b0c Mon Sep 17 00:00:00 2001
From: Russel Winder <russel@russel.org.uk>
Date: Sat, 1 Aug 2009 18:14:34 +0100
Subject: [PATCH] Make a start on building the tasks.

---
 SConstruct             | 8 ++++----
 tasks/libl4/SConscript | 5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/SConstruct b/SConstruct
index 4d66e81..06c6d2f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -149,12 +149,12 @@ else :
         LINKFLAGS = [ '-nostdlib' ] ,
         ENV = { 'PATH' : os.environ['PATH'] } ,
         LIBS = 'gcc' ,
-        CPPPATH = [ '#' + includeDirectory , '#' + buildDirectory + '/l4' , includeDirectory  , '#' + includeDirectory + '/l4' ] )
+        CPPPATH = [ '#' + includeDirectory , '#' + buildDirectory + '/l4' , includeDirectory ] )
 
     tasks = [ ]
-    for task in [ item for item in os.listdir ( 'tasks' ) if os.path.isdir ( 'tasks/' + item ) ] :
-        tasks.append ( SConscript ( 'tasks/' + item + '/SConscript' , variant_dir = buildDirectory + '/tasks/' + task , duplicate = 0 , exports = { 'environment' : tasksEnvironment } ) )
+    for task in [ item for item in os.listdir ( 'tasks' ) if os.path.isdir ( 'tasks/' + item ) and os.path.exists ( 'tasks/' + item + '/SConscript' )] :
+        tasks.append ( SConscript ( 'tasks/' + task + '/SConscript' , variant_dir = buildDirectory + '/tasks/' + task , duplicate = 0 , exports = { 'environment' : tasksEnvironment } ) )
 
-    Default ( crts.values ( ) + libs.values ( ) + [ libelf , startAxf ] ) # + tasks )
+    Default ( crts.values ( ) + libs.values ( ) + [ libelf , startAxf ] + tasks )
     
     Clean ( '.' , [ buildDirectory ] )
diff --git a/tasks/libl4/SConscript b/tasks/libl4/SConscript
index eb7abde..74f07ae 100644
--- a/tasks/libl4/SConscript
+++ b/tasks/libl4/SConscript
@@ -19,6 +19,9 @@
 
 Import ( 'environment' )
 
-library = environment.StaticLibrary ( 'l4' , Glob ( 'src/*.c' ) + Glob ( 'src/' + environment['ARCH'] + '/*.S' ) )
+e = environment.Clone ( )
+e.Append ( CPPPATH = [ '#' + 'tasks/libposix/include' , 'include/libl4/arch' ] )
+
+library = e.StaticLibrary ( 'l4' , Glob ( 'src/*.c' ) + Glob ( 'src/' + environment['ARCH'] + '/*.[cS]' ) )
 
 Return ( 'library' )