X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=657bad6559ed259db5ec0f28cb966a4293b02de8;hp=53b0331f2a250f7a18af120f87929b4cee605fdd;hb=dfce798347b60b1bff6df0cdb51b786f4ca02d7f;hpb=57d7975634e97da2d32f95054dccf40ca871e558

diff --git a/Makefile b/Makefile
index 53b0331f..657bad65 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,14 @@ 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
+	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o
 
-CPPFLAGS += -Iinclude -I. -rdynamic
-LDFLAGS = -ldl -lrt
+CPPFLAGS += -Iinclude -I.
+LDFLAGS = -ldl -lrt -rdynamic
 SHARED = -shared
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
-CPPFLAGS += -D_XOPEN_SOURCE -DMAC
 LDFLAGS = -ldl
 SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
@@ -32,6 +31,7 @@ include $(DEPS)
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
+PHONY += docs
 docs: *.c *.cc *.h
 	doxygen
 
@@ -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 -Wno-self-assign
 
 %.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)