Makefile/malloc: don't warn for self-assign

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index d530fee70ca50bb1702c7c098c565c6cdf28edb9..657bad6559ed259db5ec0f28cb966a4293b02de8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,10 +3,10 @@ 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 promise.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
@@ -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 -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
+       $(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)