Support building from within root directory

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" ;;
 

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

dummy_rocc/dummy_rocc.mk.in

@@ -1,5 +1,5 @@
 dummy_rocc_subproject_deps = \
-	spike \
+	spike_main \
 	riscv \
 	softfloat \
 

hwacha/hwacha.mk.in

@@ -1,5 +1,5 @@
 hwacha_subproject_deps = \
-	spike \
+	spike_main \
 	riscv \
 	softfloat \
 

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 \