Merge with the main repository again.

[gem5.git] / src / mem / ruby / SConscript

diff --git a/src/mem/ruby/SConscript b/src/mem/ruby/SConscript
index 3559f042f26b86891ca57206b3fb23aa3ee14f1d..06f6abd9fcb497bc167b3eacc0e238098b44a7f9 100644 (file)
--- a/src/mem/ruby/SConscript
+++ b/src/mem/ruby/SConscript
@@ -37,10 +37,11 @@ import SCons
 
 Import('*')
 
-if not env['RUBY']:
+if env['TARGET_ISA'] == 'no':
     Return()
 
-Source('libruby.cc')
+if env['PROTOCOL'] == 'None':
+    Return()
 
 def do_embed_text(target, source, env):
     """convert a text file into a file that can be embedded in C
@@ -72,14 +73,6 @@ def do_embed_text(target, source, env):
     fin.close()
     fout.close()
 
-def EmbedText(target, source, param):
-    env.Command(target, [source, Value(param)], do_embed_text)
-
-EmbedText('default_param.hh', 'config/rubyconfig.defaults',
-          'global_default_param')
-EmbedText('tester_param.hh', 'config/tester.defaults',
-          'global_default_tester_param')
-
 #
 # Link includes
 #
@@ -93,12 +86,15 @@ def MakeIncludeAction(target, source, env):
 
 def MakeInclude(source):
     target = generated_dir.File(basename(source))
-    env.Command(target, source, MakeIncludeAction)
+    include_action = MakeAction(MakeIncludeAction, Transform("MAKE INC", 1))
+    env.Command(target, source, include_action)
 
+MakeInclude('slicc_interface/AbstractEntry.hh')
 MakeInclude('slicc_interface/AbstractCacheEntry.hh')
 MakeInclude('slicc_interface/AbstractProtocol.hh')
 MakeInclude('slicc_interface/Message.hh')
 MakeInclude('slicc_interface/NetworkMessage.hh')
+MakeInclude('slicc_interface/RubyRequest.hh')
 
 # External types
 MakeInclude('buffers/MessageBuffer.hh')
@@ -112,7 +108,7 @@ MakeInclude('system/DMASequencer.hh')
 MakeInclude('system/DirectoryMemory.hh')
 MakeInclude('system/MachineID.hh')
 MakeInclude('system/MemoryControl.hh')
-MakeInclude('system/NodeID.hh')
+MakeInclude('system/WireBuffer.hh')
 MakeInclude('system/PerfectCacheMemory.hh')
 MakeInclude('system/PersistentTable.hh')
 MakeInclude('system/Sequencer.hh')