X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=concurrent-hashmap%2FMakefile;h=fece808a6d7610afe63eedc31c9232e0650ad1ab;hb=5a6521efce9bad7488fb880311d77fecd87427fa;hp=d39e8315c683ebb8041c9b2353a40e0737be69b2;hpb=faf43225ff0d1a0091f5e489714de0c26d24d02f;p=model-checker-benchmarks.git

diff --git a/concurrent-hashmap/Makefile b/concurrent-hashmap/Makefile
index d39e831..fece808 100644
--- a/concurrent-hashmap/Makefile
+++ b/concurrent-hashmap/Makefile
@@ -1,17 +1,27 @@
 include ../benchmarks.mk
 
-TESTS := table table_wildcard1
+BENCH := hashmap
+NORMAL_TESTS := testcase1 testcase2
+
+WILDCARD_TESTS := $(patsubst %, %_wildcard, $(NORMAL_TESTS))
+
+TESTS := $(NORMAL_TESTS) $(WILDCARD_TESTS)
 
 all: $(TESTS)
 
-table: main.cc hashmap.h
-	$(CXX) -o $@ $^ $(SPEC_OBJ) $(CXXFLAGS) -std=c++0x $(LDFLAGS)
+$(WILDCARD_TESTS): CXXFLAGS += -DWILDCARD
+
+$(BENCH).o : $(BENCH).h
+	$(CXX) -o $@ $< $(CXXFLAGS) -c $(LDFLAGS)
+
+$(BENCH)_wildcard.o : $(BENCH)_wildcard.h
+	$(CXX) -o $@ $< $(CXXFLAGS) -c $(LDFLAGS)
 
-table_wildcard1: main_wildcard1.cc hashmap_wildcard.h
-	$(CXX) -o $@ $^ $(SPEC_OBJ) $(CXXFLAGS) -std=c++0x $(LDFLAGS)
+$(WILDCARD_TESTS): %_wildcard : %.cc $(BENCH)_wildcard.o 
+	$(CXX) -o $@ $< $(CXXFLAGS) $(LDFLAGS)
 
-table_wildcard2: main_wildcard1.cc hashmap_wildcard.h
-	$(CXX) -o $@ $^ $(SPEC_OBJ) $(CXXFLAGS) -std=c++0x $(LDFLAGS)
+$(NORMAL_TESTS): % : %.cc $(BENCH).o
+	$(CXX) -o $@ $< $(CXXFLAGS) $(LDFLAGS)
 
 clean:
 	rm -f *.o *.d $(TESTS)