X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=concurrent-hashmap%2FMakefile;h=4c0a7dccd2a8d247eb5e87046b8c4db5fa49f948;hb=d634d19b6134309ed0893c6fd58d815cbafecd16;hp=4db5bca0e536d44f4bb95aeaef3017adbd7060b4;hpb=fce370a6252cdea0ae220afd0c38160018658c5d;p=model-checker-benchmarks.git

diff --git a/concurrent-hashmap/Makefile b/concurrent-hashmap/Makefile
index 4db5bca..4c0a7dc 100644
--- a/concurrent-hashmap/Makefile
+++ b/concurrent-hashmap/Makefile
@@ -1,11 +1,27 @@
 include ../benchmarks.mk
 
-TESTS := table 
+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)
+
+$(WILDCARD_TESTS): %_wildcard : %.cc $(BENCH)_wildcard.o 
+	$(CXX) -o $@ $< $(CXXFLAGS) $(LDFLAGS)
+
+$(NORMAL_TESTS): % : %.cc $(BENCH).o
+	$(CXX) -o $@ $< $(CXXFLAGS) $(LDFLAGS)
 
 clean:
 	rm -f *.o *.d $(TESTS)