From 1aef5c06a3702d7722dcd38e342eae950839cecb Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Sat, 10 Mar 2007 23:00:54 -0800
Subject: 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
---
 src/arch/x86/SConscript | 69 +++++++++++++++----------------------------------
 1 file changed, 21 insertions(+), 48 deletions(-)

(limited to 'src/arch/x86/SConscript')

diff --git a/src/arch/x86/SConscript b/src/arch/x86/SConscript
index fff29ba89..f49225758 100644
--- a/src/arch/x86/SConscript
+++ b/src/arch/x86/SConscript
@@ -83,55 +83,28 @@
 #
 # Authors: Gabe Black
 
-import os
-import sys
-from os.path import isdir
+Import('*')
 
-# Import build environment variable from SConstruct.
-Import('env')
+if env['TARGET_ISA'] == 'x86':
+    Source('floatregfile.cc')
+    Source('intregfile.cc')
+    Source('miscregfile.cc')
+    Source('regfile.cc')
+    Source('remote_gdb.cc')
 
-###################################################
-#
-# Define needed sources.
-#
-###################################################
-
-# Base sources used by all configurations.
-base_sources = Split('''
-	floatregfile.cc
-	intregfile.cc
-	miscregfile.cc
-	regfile.cc
-	remote_gdb.cc
-	''')
-
-# Full-system sources
-full_system_sources = Split('''
-	''')
-
-# Syscall emulation (non-full-system) sources
-syscall_emulation_sources = Split('''
-	linux/linux.cc
-	linux/process.cc
-	linux/syscalls.cc
-	process.cc
-	''')
-
-sources = base_sources
-
-if env['FULL_SYSTEM']:
-    sources += full_system_sources
-else:
-    sources += syscall_emulation_sources
-
-# 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]
+    if env['FULL_SYSTEM']:
+        # Full-system sources
+        pass
+    else:
+        Source('process.cc')
 
-# Add in files generated by the ISA description.
-isa_desc_files = env.ISADesc('isa/main.isa')
-# Only non-header files need to be compiled.
-isa_desc_sources = [f for f in isa_desc_files if not f.path.endswith('.hh')]
-sources += isa_desc_sources
+        Source('linux/linux.cc')
+        Source('linux/process.cc')
+        Source('linux/syscalls.cc')
 
-Return('sources')
+    # Add in files generated by the ISA description.
+    isa_desc_files = env.ISADesc('isa/main.isa')
+    # Only non-header files need to be compiled.
+    for f in isa_desc_files:
+        if not f.path.endswith('.hh'):
+            Source(f)
-- 
cgit v1.2.3