summaryrefslogtreecommitdiff
path: root/SConscript
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2005-03-14 15:40:51 -0500
committerKevin Lim <ktlim@umich.edu>2005-03-14 15:40:51 -0500
commit8f2a84cbe5a0cd26053d49fb0376ec18bcbeb8f4 (patch)
tree1b707750f5064ed9f89a4a1ecc2f2be4d3daddc0 /SConscript
parentc12a665c3120b61ed4e09da5d8a52c57406763d5 (diff)
parent76e6dd01ae4a534adad1d34398fefc819771a781 (diff)
downloadgem5-8f2a84cbe5a0cd26053d49fb0376ec18bcbeb8f4.tar.xz
Merge
--HG-- extra : convert_revision : 22919164108afd74f30207606f59a38992991dae
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript9
1 files changed, 5 insertions, 4 deletions
diff --git a/SConscript b/SConscript
index 94e788ce9..ad9d89ff0 100644
--- a/SConscript
+++ b/SConscript
@@ -212,6 +212,9 @@ base_sources = Split('''
mem/trace/mem_trace_writer.cc
mem/trace/m5_writer.cc
+ python/pyconfig.cc
+ python/embedded_py.cc
+
sim/builder.cc
sim/configfile.cc
sim/debug.cc
@@ -228,8 +231,6 @@ base_sources = Split('''
sim/stat_control.cc
sim/trace_context.cc
sim/universe.cc
- sim/pyconfig/pyconfig.cc
- sim/pyconfig/embedded_py.cc
''')
# MySql sources
@@ -407,8 +408,8 @@ env.Command(Split('''arch/alpha/decoder.cc
# SConscript-local is the per-config build, which just copies some
# header files into a place where they can be found.
SConscript('libelf/SConscript-local', exports = 'env', duplicate=0)
-SConscript('sim/pyconfig/SConscript', exports = ['env'], duplicate=0)
-
+SConscript('python/SConscript', exports = ['env'], duplicate=0)
+SConscript('simobj/SConscript', exports = 'env', duplicate=0)
# This function adds the specified sources to the given build
# environment, and returns a list of all the corresponding SCons