From c2344ee2bcf4db590e1c91c947075d88e1bf8bcf Mon Sep 17 00:00:00 2001
From: Christopher Celio <celio@eecs.berkeley.edu>
Date: Fri, 11 Sep 2015 19:07:33 -0700
Subject: [PATCH] Added generated-src-debug to make clean target

---
 emulator/Makefile | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/emulator/Makefile b/emulator/Makefile
index 4b550609..52d98314 100644
--- a/emulator/Makefile
+++ b/emulator/Makefile
@@ -2,7 +2,7 @@ default: all
 
 base_dir = $(abspath ..)
 generated_dir = $(abspath ./generated-src)
-generated_src_debug = $(abspath ./generated-src-debug)
+generated_dir_debug = $(abspath ./generated-src-debug)
 sim_dir = .
 output_dir = $(sim_dir)/output
 
@@ -10,7 +10,6 @@ BACKEND = c
 CONFIG ?= DefaultCPPConfig
 
 include $(base_dir)/Makefrag
--include $(generated_dir)/$(MODEL).$(CONFIG).d
 
 CXXSRCS := emulator mm mm_dramsim2
 CXXFLAGS := $(CXXFLAGS) -std=c++11 -I$(RISCV)/include -I$(base_dir)/csrc -I$(base_dir)/dramsim2
@@ -22,26 +21,26 @@ $(MODEL).$(CONFIG).o: %.o: $(generated_dir)/%.h
 	$(MAKE) -j $(patsubst %.cpp,%.o,$(shell ls $(generated_dir)/$(MODEL).$(CONFIG)-*.cpp))
 	$(LD) -r $(patsubst %.cpp,%.o,$(shell ls $(generated_dir)/$(MODEL).$(CONFIG)-*.cpp)) -o $@
 
-$(MODEL).$(CONFIG).debug.o: %.debug.o: $(generated_src_debug)/%.h
-	$(MAKE) -j $(patsubst %.cpp,%.o,$(shell ls $(generated_src_debug)/$(MODEL).$(CONFIG)-*.cpp))
-	$(LD) -r $(patsubst %.cpp,%.o,$(shell ls $(generated_src_debug)/$(MODEL).$(CONFIG)-*.cpp)) -o $@
+$(MODEL).$(CONFIG).debug.o: %.debug.o: $(generated_dir_debug)/%.h
+	$(MAKE) -j $(patsubst %.cpp,%.o,$(shell ls $(generated_dir_debug)/$(MODEL).$(CONFIG)-*.cpp))
+	$(LD) -r $(patsubst %.cpp,%.o,$(shell ls $(generated_dir_debug)/$(MODEL).$(CONFIG)-*.cpp)) -o $@
 
 $(generated_dir)/%.o: $(generated_dir)/%.cpp $(generated_dir)/%.h
 	$(CXX) $(CXXFLAGS) -I$(generated_dir) -c -o $@ $<
 
-$(generated_src_debug)/%.o: $(generated_src_debug)/%.cpp $(generated_src_debug)/%.h
-	$(CXX) $(CXXFLAGS) -I$(generated_src_debug) -c -o $@ $<
+$(generated_dir_debug)/%.o: $(generated_dir_debug)/%.cpp $(generated_dir_debug)/%.h
+	$(CXX) $(CXXFLAGS) -I$(generated_dir_debug) -c -o $@ $<
 
 $(addsuffix .o,$(CXXSRCS)): %.o: $(base_dir)/csrc/%.cc $(base_dir)/csrc/*.h $(generated_dir)/$(MODEL).$(CONFIG).h
 	$(CXX) $(CXXFLAGS) -include $(generated_dir)/$(MODEL).$(CONFIG).h -I$(generated_dir) -c -o $@ $<
 
-$(addsuffix .debug.o,$(CXXSRCS)): %.debug.o: $(base_dir)/csrc/%.cc $(base_dir)/csrc/*.h $(generated_src_debug)/$(MODEL).$(CONFIG).h
-	$(CXX) $(CXXFLAGS) -include $(generated_src_debug)/$(MODEL).$(CONFIG).h -I$(generated_src_debug) -c -o $@ $<
+$(addsuffix .debug.o,$(CXXSRCS)): %.debug.o: $(base_dir)/csrc/%.cc $(base_dir)/csrc/*.h $(generated_dir_debug)/$(MODEL).$(CONFIG).h
+	$(CXX) $(CXXFLAGS) -include $(generated_dir_debug)/$(MODEL).$(CONFIG).h -I$(generated_dir_debug) -c -o $@ $<
 
 $(generated_dir)/$(MODEL).$(CONFIG).d $(generated_dir)/$(MODEL).$(CONFIG).h : $(chisel_srcs)
 	cd $(base_dir) && $(SBT) "project $(PROJECT)" "run $(CHISEL_ARGS) --noIoDebug"
 
-$(generated_src_debug)/$(MODEL).$(CONFIG).h : $(chisel_srcs)
+$(generated_dir_debug)/$(MODEL).$(CONFIG).h : $(chisel_srcs)
 	cd $(base_dir) && $(SBT) "project $(PROJECT)" "run $(CHISEL_ARGS)-debug  --debug --vcd --ioDebug"
 
 emu = emulator-$(MODEL)-$(CONFIG)
@@ -49,14 +48,14 @@ $(emu): $(generated_dir)/$(MODEL).$(CONFIG).h $(OBJS) libdramsim.a
 	$(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 emu_debug = emulator-$(MODEL)-$(CONFIG)-debug
-$(emu_debug): $(generated_dir)/$(MODEL).$(CONFIG).d $(generated_src_debug)/$(MODEL).$(CONFIG).h $(DEBUG_OBJS) libdramsim.a
+$(emu_debug): $(generated_dir)/$(MODEL).$(CONFIG).d $(generated_dir_debug)/$(MODEL).$(CONFIG).h $(DEBUG_OBJS) libdramsim.a
 	$(CXX) $(CXXFLAGS) -o $@ $(DEBUG_OBJS) $(LDFLAGS)
 
 all: $(emu)
 debug: $(emu_debug)
 
 clean:
-	rm -rf *.o *.a emulator-* $(generated_dir) DVEfiles $(output_dir)
+	rm -rf *.o *.a emulator-* $(generated_dir) $(generated_dir_debug) DVEfiles $(output_dir)
 
 test:
 	cd $(base_dir) && $(SBT) "~make $(CURDIR) run-fast $(CHISEL_ARGS)"
@@ -67,6 +66,8 @@ test:
 # Run assembly tests and benchmarks
 #--------------------------------------------------------------------
 
+-include $(generated_dir)/$(MODEL).$(CONFIG).d
+
 $(output_dir)/%.run: $(output_dir)/%.hex emulator-$(MODEL)-$(CONFIG)
 	./$(emu) +dramsim +max-cycles=$(timeout_cycles) +loadmem=$< none 2> /dev/null 2> $@ && [ $$PIPESTATUS -eq 0 ]