ruby: Make ruby #includes use full paths to the files they're including.

This basically means changing all #include statements and changing
autogenerated code so that it generates the correct paths.  Because
slicc generates #includes, I had to hard code the include paths to
mem/protocol.

6 files changed, 13 insertions, 13 deletions

diff --git a/src/mem/slicc/generator/fileio.cc b/src/mem/slicc/generator/fileio.cc
index 1707e5b7a..273c76bfd 100644
--- a/src/mem/slicc/generator/fileio.cc
+++ b/src/mem/slicc/generator/fileio.cc
@@ -36,7 +36,7 @@
  *
  * */
 
-#include "fileio.hh"
+#include "mem/slicc/generator/fileio.hh"
 
 void conditionally_write_file(string filename, ostringstream& sstr)
 {
diff --git a/src/mem/slicc/generator/fileio.hh b/src/mem/slicc/generator/fileio.hh
index 3cca7ccaa..fa1cc3493 100644
--- a/src/mem/slicc/generator/fileio.hh
+++ b/src/mem/slicc/generator/fileio.hh
@@ -39,7 +39,7 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
-#include "slicc_global.hh"
+#include "mem/slicc/slicc_global.hh"
 
 void conditionally_write_file(string filename, ostringstream& sstr);
 
diff --git a/src/mem/slicc/generator/html_gen.cc b/src/mem/slicc/generator/html_gen.cc
index 3d17018e1..ebe02db92 100644
--- a/src/mem/slicc/generator/html_gen.cc
+++ b/src/mem/slicc/generator/html_gen.cc
@@ -36,9 +36,9 @@
  *
  * */
 
-#include "html_gen.hh"
-#include "fileio.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 string formatHTMLShorthand(const string shorthand);
 
diff --git a/src/mem/slicc/generator/html_gen.hh b/src/mem/slicc/generator/html_gen.hh
index 3f0de8df9..e90836b33 100644
--- a/src/mem/slicc/generator/html_gen.hh
+++ b/src/mem/slicc/generator/html_gen.hh
@@ -39,8 +39,8 @@
 #ifndef HTML_GEN_H
 #define HTML_GEN_H
 
-#include "slicc_global.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 string formatHTMLShorthand(const string shorthand);
 void createHTMLindex(string title, ostream& out);
diff --git a/src/mem/slicc/generator/mif_gen.cc b/src/mem/slicc/generator/mif_gen.cc
index 0e6253654..2dca149b4 100644
--- a/src/mem/slicc/generator/mif_gen.cc
+++ b/src/mem/slicc/generator/mif_gen.cc
@@ -32,11 +32,11 @@
  *
  */
 
-#include "mif_gen.hh"
-#include "State.hh"
-#include "Event.hh"
-#include "Action.hh"
-#include "Transition.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Transition.hh"
 
 // -- Helper functions
 string formatShorthand(const string shorthand);
diff --git a/src/mem/slicc/generator/mif_gen.hh b/src/mem/slicc/generator/mif_gen.hh
index ba1dc0b0b..9cc5e1ea3 100644
--- a/src/mem/slicc/generator/mif_gen.hh
+++ b/src/mem/slicc/generator/mif_gen.hh
@@ -35,7 +35,7 @@
 #ifndef MIF_GEN_H
 #define MIF_GEN_H
 
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 void printStateTableMIF(const StateMachine& sm, ostream& out);
 void printEventTableMIF(const StateMachine& sm, ostream& out);