From 6cfc5798b06261d5f85263e3399aae934108f9ca Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Mon, 8 Feb 2010 08:10:07 -0500
Subject: [PATCH] Tests: Move sc_main.cpp as there's more sc than sp users

---
 test_sc/Makefile                 |  5 +----
 test_sc/Makefile_obj             |  2 --
 {test_sp => test_sc}/sc_main.cpp |  0
 test_sp/Makefile                 | 11 ++++++++---
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename {test_sp => test_sc}/sc_main.cpp (100%)

diff --git a/test_sc/Makefile b/test_sc/Makefile
index 7acbd7e5b..9c56f8587 100644
--- a/test_sc/Makefile
+++ b/test_sc/Makefile
@@ -31,10 +31,7 @@ V_FLAGS = -f $(VERILATOR_ROOT)/test_v/input.vc
 VERILATOR_FLAGS = --sc $(V_FLAGS) top.v
 VERILATOR_FLAGS += --trace
 
-precopy: obj_dir obj_dir/sc_main.cpp
-obj_dir/sc_main.cpp: ../test_sp/sc_main.cpp
-	mkdir -p obj_dir
-	cp $^ $@
+precopy:
 
 prep:
 	$(PERL) $(VERILATOR_ROOT)/bin/verilator             $(VERILATOR_FLAGS)
diff --git a/test_sc/Makefile_obj b/test_sc/Makefile_obj
index 8d2f88162..9700c5167 100644
--- a/test_sc/Makefile_obj
+++ b/test_sc/Makefile_obj
@@ -31,6 +31,4 @@ simx: sc_main.o $(VK_GLOBAL_OBJS) \
 	  $(VM_PREFIX)__ALL.a $(SC_LIB)
 	$(LINK) $(LDFLAGS) -g $^ $(LOADLIBES) $(LDLIBS) -o $@ $(SC_LIBS) $(LIBS) 2>&1 | c++filt
 
-VPATH += ../test_sp
-
 sc_main.o: sc_main.cpp $(VM_PREFIX).h
diff --git a/test_sp/sc_main.cpp b/test_sc/sc_main.cpp
similarity index 100%
rename from test_sp/sc_main.cpp
rename to test_sc/sc_main.cpp
diff --git a/test_sp/Makefile b/test_sp/Makefile
index e480dee1f..9f0296e6a 100644
--- a/test_sp/Makefile
+++ b/test_sp/Makefile
@@ -24,9 +24,9 @@ include $(VERILATOR_ROOT)/include/verilated.mk
 DEBUG_ON = --debug --trace-dups
 
 ######################################################################
-test_default:  prep        preproc compile     run coverage
-test_debug:    prep_dbg    preproc compile_dbg run coverage
-test_nopublic: prep_dbg_np preproc compile_dbg run coverage
+test_default:  precopy prep        preproc compile     run coverage
+test_debug:    precopy prep_dbg    preproc compile_dbg run coverage
+test_nopublic: precopy prep_dbg_np preproc compile_dbg run coverage
 
 V_FLAGS = -f $(VERILATOR_ROOT)/test_v/input.vc
 
@@ -35,6 +35,11 @@ V_FLAGS = -f $(VERILATOR_ROOT)/test_v/input.vc
 VERILATOR_FLAGS = --public --output-split-cfuncs 1000 --output-split 1000 \
 	--sp --coverage --stats --trace $(V_FLAGS) top.v
 
+precopy: obj_dir obj_dir/sc_main.cpp
+obj_dir/sc_main.cpp: ../test_sc/sc_main.cpp
+	mkdir -p obj_dir
+	cp $^ $@
+
 prep:
 	$(PERL) $(VERILATOR_ROOT)/bin/verilator             $(VERILATOR_FLAGS)
 prep_dbg: