nodestack: print thread status info in Node::print

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index 764b8abf1bd2050641b498b06736f8990ca14ad3..ea73d93d7901e7b78d2a81b8aab1c54924eb68f9 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
@@ -17,16 +17,7 @@ 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
-
-$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
-       $(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
-
-include $(DEPS)
+all: $(LIB_SO) tests
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -42,11 +33,16 @@ malloc.o: malloc.c
        $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
 %.o: %.cc
-       $(CXX) -fPIC -c $< $(CPPFLAGS)
+       $(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
+
+%.pdf: %.dot
+       dot -Tpdf $< -o $@
+
+-include $(OBJECTS:%=.%.d)
 
 PHONY += clean
 clean:
-       rm -f *.o *.so
+       rm -f *.o *.so .*.d *.pdf *.dot
        $(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean
@@ -61,16 +57,19 @@ PHONY += tests
 tests: $(LIB_SO)
        $(MAKE) -C $(TESTS_DIR)
 
-BENCHMARKS := benchmarks
+BENCH_DIR := benchmarks
 
 PHONY += benchmarks
 benchmarks: $(LIB_SO)
-       @if ! test -d $(BENCHMARKS); then \
-               echo "Directory $(BENCHMARKS) does not exist" && \
+       @if ! test -d $(BENCH_DIR); then \
+               echo "Directory $(BENCH_DIR) does not exist" && \
                echo "Please clone the benchmarks repository" && \
                echo && \
                exit 1; \
        fi
-       $(MAKE) -C $(BENCHMARKS)
+       $(MAKE) -C $(BENCH_DIR)
+
+PHONY += pdfs
+pdfs: $(patsubst %.dot,%.pdf,$(wildcard *.dot))
 
 .PHONY: $(PHONY)