Rework the way SCons recurses into subdirectories, making it

automatic.  The point is that now a subdirectory can be added
to the build process just by creating a SConscript file in it.
The process has two passes.  On the first pass, all subdirs
of the root of the tree are searched for SConsopts files.
These files contain any command line options that ought to be
added for a particular subdirectory.  On the second pass,
all subdirs of the src directory are searched for SConscript
files.  These files describe how to build any given subdirectory.
I have added a Source() function.  Any file (relative to the
directory in which the SConscript resides) passed to that
function is added to the build.  Clean up everything to take
advantage of Source().
function is added to the list of files to be built.

--HG--
extra : convert_revision : 103f6b490d2eb224436688c89cdc015211c4fd30

3 files changed, 39 insertions, 102 deletions

diff --git a/src/dev/SConscript b/src/dev/SConscript
index 951bc29d1..1ec83de4b 100644
--- a/src/dev/SConscript
+++ b/src/dev/SConscript
@@ -29,51 +29,29 @@
 # Authors: Steve Reinhardt
 #          Gabe Black
 
-import os.path, sys
-
-# Import build environment variable from SConstruct.
-Import('env')
-
-# Right now there are no source files immediately in this directory
-sources = []
-
-#
-# Now include other ISA-specific sources from the ISA subdirectories.
-#
-
-isa = env['TARGET_ISA'] # someday this may be a list of ISAs
-
-#
-# These source files can be used by any architecture
-#
-
-sources += Split('''
-	baddev.cc
-	disk_image.cc
-	etherbus.cc
-	etherdump.cc
-	etherint.cc
-	etherlink.cc
-	etherpkt.cc
-	ethertap.cc	
-        ide_ctrl.cc
-	ide_disk.cc
-	io_device.cc
-	isa_fake.cc
-	ns_gige.cc
-	pciconfigall.cc
-	pcidev.cc
-	pktfifo.cc
-	platform.cc
-        simconsole.cc
-	simple_disk.cc
-	''')
-
-# Let the target architecture define what additional sources it needs
-sources += SConscript(os.path.join(isa, 'SConscript'), exports = 'env')
-
-# Convert file names to SCons File objects.  This takes care of the
-# path relative to the top of the directory tree.
-sources = [File(s) for s in sources]
-
-Return('sources')
+Import('*')
+
+if env['FULL_SYSTEM']:
+    Source('baddev.cc')
+    Source('disk_image.cc')
+    Source('etherbus.cc')
+    Source('etherdump.cc')
+    Source('etherint.cc')
+    Source('etherlink.cc')
+    Source('etherpkt.cc')
+    Source('ethertap.cc')	
+    #Source('i8254xGBe.cc')
+    Source('ide_ctrl.cc')
+    Source('ide_disk.cc')
+    Source('io_device.cc')
+    Source('isa_fake.cc')
+    Source('ns_gige.cc')
+    Source('pciconfigall.cc')
+    Source('pcidev.cc')
+    Source('pktfifo.cc')
+    Source('platform.cc')
+    Source('simconsole.cc')
+    Source('simple_disk.cc')
+    #Source('sinic.cc')
+    Source('uart.cc')
+    Source('uart8250.cc')
diff --git a/src/dev/alpha/SConscript b/src/dev/alpha/SConscript
index fb0e626d3..c985fdd9f 100644
--- a/src/dev/alpha/SConscript
+++ b/src/dev/alpha/SConscript
@@ -29,40 +29,11 @@
 # Authors: Steve Reinhardt
 #          Gabe Black
 
-import os.path, sys
+Import('*')
 
-# Import build environment variable from SConstruct.
-Import('env')
-
-sources = Split('''
-	console.cc
-	tsunami.cc
-	tsunami_cchip.cc
-	tsunami_io.cc
-	tsunami_pchip.cc
-	''')
-#	baddev.cc
-#	disk_image.cc
-#	etherbus.cc
-#	etherdump.cc
-#	etherint.cc
-#	etherlink.cc
-#	etherpkt.cc
-#	ethertap.cc	
-#       ide_ctrl.cc
-#	ide_disk.cc
-#	io_device.cc
-#	isa_fake.cc
-#	ns_gige.cc
-#	pciconfigall.cc
-#	pcidev.cc
-#	pktfifo.cc
-#	platform.cc
-#       simconsole.cc
-#	simple_disk.cc
-
-# Convert file names to SCons File objects.  This takes care of the
-# path relative to the top of the directory tree.
-sources = [File(s) for s in sources]
-
-Return('sources')
+if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'alpha':
+    Source('console.cc')
+    Source('tsunami.cc')
+    Source('tsunami_cchip.cc')
+    Source('tsunami_io.cc')
+    Source('tsunami_pchip.cc')
diff --git a/src/dev/sparc/SConscript b/src/dev/sparc/SConscript
index 4d63690c2..8511b16fb 100644
--- a/src/dev/sparc/SConscript
+++ b/src/dev/sparc/SConscript
@@ -29,22 +29,10 @@
 # Authors: Steve Reinhardt
 #          Gabe Black
 
-import os.path, sys
+Import('*')
 
-# Import build environment variable from SConstruct.
-Import('env')
-
-sources = []
-
-sources += Split('''
-	dtod.cc
-        iob.cc
-	t1000.cc
-	mm_disk.cc
-	''')
-
-# Convert file names to SCons File objects.  This takes care of the
-# path relative to the top of the directory tree.
-sources = [File(s) for s in sources]
-
-Return('sources')
+if env['FULL_SYSTEM'] and env['TARGET_ISA'] == 'sparc':
+    Source('dtod.cc')
+    Source('iob.cc')
+    Source('t1000.cc')
+    Source('mm_disk.cc')