X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=ff5c7d9d26c4e28ff2a1ce8f2e1b9eed3c5790d0;hb=a69e8aff5040edf3c2448d401b69e2411723c557;hp=19f9a2c06900c5835fae6d256ff91d83437dbdc3;hpb=4f83ef5c527cb7dccab5dcce7e7e9dd00090612d;p=model-checker.git

diff --git a/Makefile b/Makefile
index 19f9a2c..ff5c7d9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ include common.mk
 OBJECTS = libthreads.o schedule.o model.o threads.o librace.o action.o \
 	  nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o \
 	  datarace.o impatomic.o cmodelint.o \
-	  snapshot.o malloc.o mymemory.o common.o mutex.o
+	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o
 
 CPPFLAGS += -Iinclude -I. -rdynamic
 LDFLAGS = -ldl -lrt
@@ -39,7 +39,7 @@ $(LIB_SO): $(OBJECTS)
 	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
 
 malloc.o: malloc.c
-	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
 %.o: %.cc
 	$(CXX) -fPIC -c $< $(CPPFLAGS)
@@ -61,4 +61,16 @@ PHONY += tests
 tests: $(LIB_SO)
 	$(MAKE) -C $(TESTS_DIR)
 
+BENCHMARKS := benchmarks
+
+PHONY += benchmarks
+benchmarks: $(LIB_SO)
+	@if ! test -d $(BENCHMARKS); then \
+		echo "Directory $(BENCHMARKS) does not exist" && \
+		echo "Please clone the benchmarks repository" && \
+		echo && \
+		exit 1; \
+	fi
+	$(MAKE) -C $(BENCHMARKS)
+
 .PHONY: $(PHONY)