From e08ab58b095c9be346e769304634e510bbcb4464 Mon Sep 17 00:00:00 2001
From: Bahadir Balban <bbalban@b-labs.co.uk>
Date: Mon, 14 Sep 2009 19:07:12 +0300
Subject: [PATCH] Can now compile loader, libl4, libelf, libc from
 SConstruct.loader

---
 SConstruct                 |  6 +++---
 conts/libl4/SConscript     |  2 +-
 loader/libs/elf/SConscript | 22 +++++-----------------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/SConstruct b/SConstruct
index 884f5ee..950702f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -41,6 +41,6 @@ objects += SConscript('src/api/SConscript', exports = {'symbols' : all_syms, 'en
 
 kernel_elf = env.Program(BUILDDIR + '/kernel.elf', objects)
 
-#libl4 = SConscript('conts/libl4/SConscript', \
-#                   exports = { 'arch' : arch }, duplicate = 0, \
-#                   variant_dir = join(BUILDDIR, os.path.relpath('conts/libl4', PROJROOT)))
+libl4 = SConscript('conts/libl4/SConscript', \
+                   exports = { 'arch' : arch }, duplicate = 0, \
+                   variant_dir = join(BUILDDIR, os.path.relpath('conts/libl4', PROJROOT)))
diff --git a/conts/libl4/SConscript b/conts/libl4/SConscript
index 3e2368d..e0b468c 100644
--- a/conts/libl4/SConscript
+++ b/conts/libl4/SConscript
@@ -33,7 +33,7 @@ env = Environment(CC = 'arm-none-linux-gnueabi-gcc',
 		  ASFLAGS = ['-D__ASSEMBLY__'],
 		  ENV = {'PATH' : os.environ['PATH']},
 		  LIBS = 'gcc',
-		  CPPPATH = ['#include', '#include/l4lib/arch', join(PROJROOT,'include') ])
+		  CPPPATH = ['include', 'include/l4lib/arch', join(PROJROOT, 'include') ])
 
 
 def create_symlinks(arch):
diff --git a/loader/libs/elf/SConscript b/loader/libs/elf/SConscript
index 5334e6e..7e2e23a 100644
--- a/loader/libs/elf/SConscript
+++ b/loader/libs/elf/SConscript
@@ -4,28 +4,16 @@
 #
 #  Copyright © 2009  B Labs Ltd
 #
-#  This program is free software: you can redistribute it and/or modify it under the terms of the GNU
-#  General Public License as published by the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
-#  the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
-#  License for more details.
-#
-#  You should have received a copy of the GNU General Public License along with this program.  If not, see
-#  <http://www.gnu.org/licenses/>.
-#
-#  Author: Russel Winder
 
-Import('environment')
+Import('env')
 
-e = environment.Clone()
-e.Append(CPPPATH = ['include', '#libs/c/include', '#libs/c/include/arch/' + e['ARCH']])
+arch = 'arm'
+e = env.Clone()
+#e.Append(CPPPATH = ['include', '#libs/c/include', '#libs/c/include/arch/' + arch])
+e.Append(CPPPATH = ['include'])
 e.Append(CCFLAGS = '-nostdinc')
 
 objects = e.StaticObject(Glob('src/*.c'))
-Depends(objects, e['configFiles'])
 library = e.StaticLibrary('elf', objects)
-Depends(library, e['configFiles'])
 
 Return('library')