fixup makefiles

diff --git a/Makefile b/Makefile
index 028a9466e4e660f520b300101f720553b8f3e01f..7ff12dc9316fad59a633e573b1f1643a5c858e8b 100644 (file)
--- 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 34dd9dfd8ef03832ce4037f9678166399a587949..f3710a11d3d2b278b5cc5358f0e75fdb377c2a51 100644 (file)
--- 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 eeb2f74a637f0fcf4d85822c1dcac5a27e89f585..a87f18df9215f52aab678d57f19dd0bc7313d593 100644 (file)
--- 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