From a0bd12d85d2ed4014c191d15d0ebad02803abc6d Mon Sep 17 00:00:00 2001
From: Tayler Hetherington <tayler.hetherington@gmail.com>
Date: Mon, 8 Apr 2013 14:36:06 -0800
Subject: Updating gpuwattch makefiles

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

(limited to 'src')

diff --git a/src/gpuwattch/cacti/cacti.mk b/src/gpuwattch/cacti/cacti.mk
index 506f3af..c8c2192 100644
--- a/src/gpuwattch/cacti/cacti.mk
+++ b/src/gpuwattch/cacti/cacti.mk
@@ -49,11 +49,11 @@ obj_$(TAG)/$(TARGET) : $(OBJS)
 #obj_$(TAG)/%.o : %.cc
 #	$(CXX) -c $(CXXFLAGS) $(INCS) -o $@ $<
 
-../Makefile.makedepend: depend
+Makefile.makedepend: depend
 
 depend:
-	touch ../Makefile.makedepend
-	makedepend -f../Makefile.makedepend -pobj_$(TAG)/ -a $(SRCS) 2> /dev/null
+	touch Makefile.makedepend
+	makedepend -fMakefile.makedepend -pobj_$(TAG)/ -a $(SRCS) 2> /dev/null
 
 obj_$(TAG)/%.o : %.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@
@@ -61,4 +61,4 @@ obj_$(TAG)/%.o : %.cc
 clean:
 	-rm -f *.o _cacti.so cacti.py $(TARGET)
 
-#include ../Makefile.makedepend
+include Makefile.makedepend
diff --git a/src/gpuwattch/mcpat.mk b/src/gpuwattch/mcpat.mk
index 1a9405d..64db479 100644
--- a/src/gpuwattch/mcpat.mk
+++ b/src/gpuwattch/mcpat.mk
@@ -8,7 +8,7 @@ ifndef NTHREADS
 endif
 
 
-LIBS = 
+LIBS = -I/usr/lib/ -I/usr/lib64/
 INCS = -lm
 
 CC=
@@ -95,7 +95,7 @@ Makefile.makedepend: depend
 depend:
 	touch Makefile.makedepend
 	makedepend -fMakefile.makedepend -pobj_$(TAG)/ $(SRCS) 2> /dev/null
-	@$(MAKE) -C ./cacti/ depend
+	$(MAKE) -C ./cacti/ depend
 
 clean:
 	-rm -f *.o $(TARGET)
-- 
cgit v1.3