Support building from within root directory

12 files changed, 15 insertions, 15 deletions

diff --git a/configure b/configure
index e98db52..fbbd294 100755
--- a/configure
+++ b/configure
@@ -4393,7 +4393,7 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h
 
     # Add subproject to our running list
 
-    subprojects="$subprojects spike"
+    subprojects="$subprojects spike_main"
 
     # Process the subproject appropriately. If enabled add it to the
     # $enabled_subprojects running shell variable, set a
@@ -4401,14 +4401,14 @@ $as_echo "#define SOFTFLOAT_ENABLED /**/" >>confdefs.h
     # 'subproject.ac'.
 
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : spike" >&5
-$as_echo "$as_me: configuring default subproject : spike" >&6;}
-      ac_config_files="$ac_config_files spike.mk:spike/spike.mk.in"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: configuring default subproject : spike_main" >&5
+$as_echo "$as_me: configuring default subproject : spike_main" >&6;}
+      ac_config_files="$ac_config_files spike_main.mk:spike_main/spike_main.mk.in"
 
-      enable_spike_sproj="yes"
-      subprojects_enabled="$subprojects_enabled spike"
+      enable_spike_main_sproj="yes"
+      subprojects_enabled="$subprojects_enabled spike_main"
 
-$as_echo "#define SPIKE_ENABLED /**/" >>confdefs.h
+$as_echo "#define SPIKE_MAIN_ENABLED /**/" >>confdefs.h
 
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
@@ -5194,7 +5194,7 @@ do
     "hwacha.mk") CONFIG_FILES="$CONFIG_FILES hwacha.mk:hwacha/hwacha.mk.in" ;;
     "dummy_rocc.mk") CONFIG_FILES="$CONFIG_FILES dummy_rocc.mk:dummy_rocc/dummy_rocc.mk.in" ;;
     "softfloat.mk") CONFIG_FILES="$CONFIG_FILES softfloat.mk:softfloat/softfloat.mk.in" ;;
-    "spike.mk") CONFIG_FILES="$CONFIG_FILES spike.mk:spike/spike.mk.in" ;;
+    "spike_main.mk") CONFIG_FILES="$CONFIG_FILES spike_main.mk:spike_main/spike_main.mk.in" ;;
     "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
diff --git a/configure.ac b/configure.ac
index 89d4dcf..084028f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,7 +82,7 @@ AC_SUBST([CXXFLAGS],["-Wall -Wno-unused -O2 -std=c++11"])
 # The '*' suffix indicates an optional subproject. The '**' suffix
 # indicates an optional subproject which is also the name of a group.
 
-MCPPBS_SUBPROJECTS([ riscv, hwacha, dummy_rocc, softfloat, spike ])
+MCPPBS_SUBPROJECTS([ riscv, hwacha, dummy_rocc, softfloat, spike_main ])
 
 #-------------------------------------------------------------------------
 # MCPPBS subproject groups
diff --git a/dummy_rocc/dummy_rocc.mk.in b/dummy_rocc/dummy_rocc.mk.in
index 298b9f9..0143ffd 100644
--- a/dummy_rocc/dummy_rocc.mk.in
+++ b/dummy_rocc/dummy_rocc.mk.in
@@ -1,5 +1,5 @@
 dummy_rocc_subproject_deps = \
-	spike \
+	spike_main \
 	riscv \
 	softfloat \
 
diff --git a/hwacha/hwacha.mk.in b/hwacha/hwacha.mk.in
index d1d9a01..6b258a0 100644
--- a/hwacha/hwacha.mk.in
+++ b/hwacha/hwacha.mk.in
@@ -1,5 +1,5 @@
 hwacha_subproject_deps = \
-	spike \
+	spike_main \
 	riscv \
 	softfloat \
 
diff --git a/spike/disasm.cc b/spike_main/disasm.cc
index 8fb1db8..8fb1db8 100644
--- a/spike/disasm.cc
+++ b/spike_main/disasm.cc
diff --git a/spike/extensions.cc b/spike_main/extensions.cc
index 315621f..315621f 100644
--- a/spike/extensions.cc
+++ b/spike_main/extensions.cc
diff --git a/spike/riscv-dis.cc b/spike_main/riscv-dis.cc
index d0af451..d0af451 100644
--- a/spike/riscv-dis.cc
+++ b/spike_main/riscv-dis.cc
diff --git a/spike/spike.cc b/spike_main/spike.cc
index ab5cea5..ab5cea5 100644
--- a/spike/spike.cc
+++ b/spike_main/spike.cc
diff --git a/spike/spike.ac b/spike_main/spike_main.ac
index f8d63ce..f8d63ce 100644
--- a/spike/spike.ac
+++ b/spike_main/spike_main.ac
diff --git a/spike/spike.mk.in b/spike_main/spike_main.mk.in
index 96f0126..0ac70ef 100644
--- a/spike/spike.mk.in
+++ b/spike_main/spike_main.mk.in
@@ -1,14 +1,14 @@
-spike_subproject_deps = \
+spike_main_subproject_deps = \
 	softfloat \
 	riscv \
 
-spike_install_prog_srcs = \
+spike_main_install_prog_srcs = \
 	spike.cc \
 	riscv-dis.cc \
 	xspike.cc \
 	termios-xspike.cc \
 
-spike_hdrs = \
+spike_main_hdrs = \
 
-spike_srcs = \
+spike_main_srcs = \
   extensions.cc \
diff --git a/spike/termios-xspike.cc b/spike_main/termios-xspike.cc
index e533933..e533933 100644
--- a/spike/termios-xspike.cc
+++ b/spike_main/termios-xspike.cc
diff --git a/spike/xspike.cc b/spike_main/xspike.cc
index 4331dbe..4331dbe 100644
--- a/spike/xspike.cc
+++ b/spike_main/xspike.cc