model: add read-acquire/fence-release support

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index 2acdbc7dff8a7738c6f99349421aa66bc97b5d5b..c363876dfd3fef30a0f2a3ecef3832949854c023 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,33 +3,38 @@ 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
+         snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o
 
 CPPFLAGS += -Iinclude -I.
-LDFLAGS=-ldl -lrt
-SHARED=-shared
+LDFLAGS = -ldl -lrt -rdynamic
+SHARED = -shared
 
-TESTS=test
+# Mac OSX options
+ifeq ($(UNAME), Darwin)
+LDFLAGS = -ldl
+SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
+endif
+
+TESTS_DIR = test
 
 program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
 program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
 DEPS = make.deps
 
-all: $(LIB_SO) $(DEPS) tests
+all: $(LIB_SO) tests
 
+$(DEPS): build_deps := 1
 $(DEPS): $(program_C_SRCS) $(program_H_SRCS)
-       $(CXX) $(CPPFLAGS) -MM $(program_C_SRCS) > $(DEPS)
+       $(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
 
+ifeq ($(build_deps),1)
 include $(DEPS)
+endif
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
-mac: LDFLAGS=-ldl
-mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
-mac: all
-
+PHONY += docs
 docs: *.c *.cc *.h
        doxygen
 
@@ -37,20 +42,38 @@ $(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
+%.o: %.cc $(DEPS)
        $(CXX) -fPIC -c $< $(CPPFLAGS)
 
+PHONY += clean
 clean:
        rm -f *.o *.so
-       $(MAKE) -C $(TESTS) clean
+       $(MAKE) -C $(TESTS_DIR) clean
 
+PHONY += mrclean
 mrclean: clean
        rm -rf docs
 
-tags::
+PHONY += tags
+tags:
        ctags -R
 
-tests:: $(LIB_SO)
-       $(MAKE) -C $(TESTS)
+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)