From 5d69aa95a9ea9ac326c34c4842b87e8123a77186 Mon Sep 17 00:00:00 2001
From: Tim Rogers <timrogers@gmail.com>
Date: Tue, 25 Jun 2013 13:19:58 -0800
Subject:  Changing the make flow so all the generated files, both object and
 code generated go in a directory independent of the source directory

[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 16503]
---
 src/gpuwattch/cacti/cacti.mk | 21 +++++++++++----------
 src/gpuwattch/mcpat.mk       | 19 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

(limited to 'src/gpuwattch')

diff --git a/src/gpuwattch/cacti/cacti.mk b/src/gpuwattch/cacti/cacti.mk
index c8c2192..1de6e9e 100644
--- a/src/gpuwattch/cacti/cacti.mk
+++ b/src/gpuwattch/cacti/cacti.mk
@@ -1,3 +1,5 @@
+
+OUTPUT_DIR=$(SIM_OBJ_FILES_DIR)/gpuwattch/cacti
 TARGET = cacti
 SHELL = /bin/sh
 .PHONY: all depend clean
@@ -35,30 +37,29 @@ SRCS  = area.cc bank.cc mat.cc main.cc Ucache.cc io.cc technology.cc basic_circu
 		decoder.cc component.cc uca.cc subarray.cc wire.cc htree2.cc \
 		cacti_interface.cc router.cc nuca.cc crossbar.cc arbiter.cc 
 
-OBJS = $(patsubst %.cc,obj_$(TAG)/%.o,$(SRCS))
-PYTHONLIB_SRCS = $(patsubst main.cc, ,$(SRCS)) obj_$(TAG)/cacti_wrap.cc
+OBJS = $(patsubst %.cc,$(OUTPUT_DIR)/%.o,$(SRCS))
+PYTHONLIB_SRCS = $(patsubst main.cc, ,$(SRCS)) $(OUTPUT_DIR)/cacti_wrap.cc
 PYTHONLIB_OBJS = $(patsubst %.cc,%.o,$(PYTHONLIB_SRCS)) 
 INCLUDES       = -I /usr/include/python2.4 -I /usr/lib/python2.4/config
 
-all: obj_$(TAG)/$(TARGET)
-	cp -f obj_$(TAG)/$(TARGET) $(TARGET)
+all: $(OUTPUT_DIR)/$(TARGET)
 
-obj_$(TAG)/$(TARGET) : $(OBJS)
+$(OUTPUT_DIR)/$(TARGET) : $(OBJS)
 	$(CXX) $(OBJS) -o $@ $(INCS) $(CXXFLAGS) $(LIBS) -pthread
 
 #obj_$(TAG)/%.o : %.cc
 #	$(CXX) -c $(CXXFLAGS) $(INCS) -o $@ $<
 
-Makefile.makedepend: depend
+$(OUTPUT_DIR)/Makefile.makedepend: depend
 
 depend:
-	touch Makefile.makedepend
-	makedepend -fMakefile.makedepend -pobj_$(TAG)/ -a $(SRCS) 2> /dev/null
+	touch $(OUTPUT_DIR)/Makefile.makedepend
+	makedepend -f$(OUTPUT_DIR)/Makefile.makedepend -p$(OUTPUT_DIR)/ -a $(SRCS) 2> /dev/null
 
-obj_$(TAG)/%.o : %.cc
+$(OUTPUT_DIR)/%.o : %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
 clean:
 	-rm -f *.o _cacti.so cacti.py $(TARGET)
 
-include Makefile.makedepend
+include $(OUTPUT_DIR)/Makefile.makedepend
diff --git a/src/gpuwattch/mcpat.mk b/src/gpuwattch/mcpat.mk
index 64db479..a09c23b 100644
--- a/src/gpuwattch/mcpat.mk
+++ b/src/gpuwattch/mcpat.mk
@@ -1,3 +1,5 @@
+
+OUTPUT_DIR=$(SIM_OBJ_FILES_DIR)/gpuwattch
 TARGET = mcpat
 SHELL = /bin/sh
 .PHONY: all depend clean
@@ -76,29 +78,28 @@ SRCS  = \
 
 
 
-OBJS = $(patsubst %.cc,obj_$(TAG)/%.o,$(SRCS))
+OBJS = $(patsubst %.cc,$(OUTPUT_DIR)/%.o,$(SRCS))
 
-all: obj_$(TAG)/$(TARGET)
-	cp -f obj_$(TAG)/$(TARGET) $(TARGET)
+all: $(OUTPUT_DIR)/$(TARGET)
 
-obj_$(TAG)/$(TARGET) : $(OBJS)
+$(OUTPUT_DIR)/$(TARGET) : $(OBJS)
 	$(CXX) $(OBJS) -o $@ $(INCS) $(CXXFLAGS) $(LIBS) -pthread
 
 #obj_$(TAG)/%.o : %.cc
 #	$(CXX) -c $(CXXFLAGS) $(INCS) -o $@ $<
 
-obj_$(TAG)/%.o : %.cc
+$(OUTPUT_DIR)/%.o : %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@
 
-Makefile.makedepend: depend
+$(OUTPUT_DIR)/Makefile.makedepend: depend
 
 depend:
-	touch Makefile.makedepend
-	makedepend -fMakefile.makedepend -pobj_$(TAG)/ $(SRCS) 2> /dev/null
+	touch $(OUTPUT_DIR)/Makefile.makedepend
+	makedepend -f$(OUTPUT_DIR)/Makefile.makedepend -p$(OUTPUT_DIR)/ $(SRCS) 2> /dev/null
 	$(MAKE) -C ./cacti/ depend
 
 clean:
 	-rm -f *.o $(TARGET)
 	rm -f Makefile.makedepend Makefile.makedepend.bak
 
-include Makefile.makedepend
+include $(OUTPUT_DIR)/Makefile.makedepend
-- 
cgit v1.3