Merge branch 'newBuild' of /opt/c0-trees/codezero-russel into devel

Conflicts:

	SConstruct
	src/api/SConscript
	src/arch/arm/SConscript
	src/generic/SConscript
	tasks/bootdesc/SConstruct

src/lib/SConscript

@@ -1,12 +1,24 @@
+# -*- mode: python; coding: utf-8; -*-
 
+#  Codezero -- a microkernel for embedded systems.
+#
+#  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
 
-# Inherit global environment
-Import('env')
-Import('config_symbols')
-# The set of source files associated with this SConscript file.
-src_local = ['printk.c', 'putc.c', 'string.c', 'bit.c', 'wait.c', 'mutex.c', 'idpool.c', 'memcache.c']
-if "ARCH_TEST" not in config_symbols:
-	obj = env.Object(src_local)
-else:
-	obj = []
-Return('obj')
+Import('environment')
+
+objects = environment.Object(Glob('*.c'))
+
+Return('objects')