Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index a732cb763ad7a8dcf1ef9900ac4473921000163c..d530fee70ca50bb1702c7c098c565c6cdf28edb9 100644 (file)
--- 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
 
 CPPFLAGS += -Iinclude -I. -rdynamic
 LDFLAGS = -ldl -lrt
@@ -11,7 +11,6 @@ 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
 
 %.o: %.cc
        $(CXX) -fPIC -c $< $(CPPFLAGS)