From 063050ea4ff7160a3426d8ec9757006720285e0f Mon Sep 17 00:00:00 2001
From: Brian Norris <banorris@uci.edu>
Date: Wed, 10 Oct 2012 15:41:51 -0700
Subject: [PATCH] fixup makefiles

---
 Makefile         | 7 ++++++-
 barrier/Makefile | 8 ++++----
 benchmarks.mk    | 5 +++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 028a946..7ff12dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,13 @@
 DIRS := barrier mcs-lock
 
-.PHONY: subdirs $(DIRS)
+.PHONY: $(DIRS)
 
 all: $(DIRS)
 
+clean: $(DIRS:%=clean-%)
+
 $(DIRS):
 	$(MAKE) -C $@
+
+clean-%:
+	-$(MAKE) -C $* clean
diff --git a/barrier/Makefile b/barrier/Makefile
index 34dd9df..f3710a1 100644
--- a/barrier/Makefile
+++ b/barrier/Makefile
@@ -1,11 +1,11 @@
 include ../benchmarks.mk
 
-BIN = barrier
+TESTNAME = barrier
 
-all: barrier
+all: $(TESTNAME)
 
-barrier: barrier.cc barrier.h
+$(TESTNAME): $(TESTNAME).cc $(TESTNAME).h
 	$(CXX) -o $@ $< $(CPPFLAGS) $(LDFLAGS)
 
 clean:
-	rm -f $(BIN) *.o
+	rm -f $(TESTNAME) *.o
diff --git a/benchmarks.mk b/benchmarks.mk
index eeb2f74..a87f18d 100644
--- a/benchmarks.mk
+++ b/benchmarks.mk
@@ -10,8 +10,9 @@ LIB_SO = lib$(LIB_NAME).so
 
 BASE = ../..
 INCLUDE = -I$(BASE)/include  -I$(BASE) -I../include
-CPPFLAGS += $(INCLUDE)
-CFLAGS += $(INCLUDE)
+FLAGS := -g -rdynamic
+CPPFLAGS += $(INCLUDE) $(FLAGS)
+CFLAGS += $(INCLUDE) $(FLAGS)
 LDFLAGS += -L$(BASE) -l$(LIB_NAME)
 
 # Mac OSX options
-- 
2.34.1