Merge zizzer.eecs.umich.edu:/bk/newmem

into  zower.eecs.umich.edu:/home/gblack/m5/newmem-statetrace

--HG--
extra : convert_revision : 725999a0a5bde6e065bad87b42e973c5c627c69f

1 files changed, 9 insertions, 4 deletions

diff --git a/src/python/SConscript b/src/python/SConscript
index 94db1a747..6662c8a45 100644
--- a/src/python/SConscript
+++ b/src/python/SConscript
@@ -29,14 +29,14 @@
 # Authors: Steve Reinhardt
 #          Nathan Binkert
 
-import os, os.path, re, sys
-from zipfile import PyZipFile
+import os
+import zipfile
 
 # handy function for path joins
 def join(*args):
     return os.path.normpath(os.path.join(*args))
 
-Import('env')
+Import('*')
 
 # This SConscript is in charge of collecting .py files and generating
 # a zip archive that is appended to the m5 binary.
@@ -106,6 +106,11 @@ def swig_it(module):
                 '$SWIG $SWIGFLAGS -outdir ${TARGETS[1].dir} '
                 '-o ${TARGETS[0]} $SOURCES')
     swig_modules.append(module)
+    Source('swig/%s_wrap.cc' % module)
+
+Source('swig/init.cc')
+Source('swig/pyevent.cc')
+Source('swig/pyobject.cc')
 
 swig_it('core')
 swig_it('debug')
@@ -144,7 +149,7 @@ env.Command('swig/init.cc', swig_cc_files, MakeSwigInit)
 # Action function to build the zip archive.  Uses the PyZipFile module
 # included in the standard Python library.
 def buildPyZip(target, source, env):
-    pzf = PyZipFile(str(target[0]), 'w')
+    pzf = zipfile.PyZipFile(str(target[0]), 'w')
     for s in source:
         pzf.writepy(str(s))