move work_list (thrd_func_list) from history.h to execution.h, and fix the memory...

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index cf4a493b2a523fed3ed327509d69a396657f8cc9..fcebbf36c21ebcfd7988238d8ee3799fb00e5f27 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,9 @@ 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 conditionvariable.o \
-          context.o execution.o libannotate.o
+          snapshot.o malloc.o mymemory.o common.o mutex.o conditionvariable.o \
+          context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
+          sleeps.o history.o funcnode.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic
@@ -32,10 +33,12 @@ docs: *.c *.cc *.h README.html
 README.html: README.md
        $(MARKDOWN) $< > $@
 
-
 malloc.o: malloc.c
        $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
+#futex.o: futex.cc
+#      $(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
+
 %.o : %.cc
        $(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
 
@@ -63,7 +66,7 @@ tags:
 
 PHONY += tests
 tests: $(LIB_SO)
-       $(MAKE) -C $(TESTS_DIR)
+#      $(MAKE) -C $(TESTS_DIR)
 
 BENCH_DIR := benchmarks
 
@@ -85,3 +88,7 @@ pdfs: $(patsubst %.dot,%.pdf,$(wildcard *.dot))
 # A 1-inch margin PDF generated by 'pandoc'
 %.pdf: %.md
        pandoc -o $@ $< -V header-includes='\usepackage[margin=1in]{geometry}'
+
+tabbing:
+       uncrustify -c C.cfg --no-backup --replace *.cc
+       uncrustify -c C.cfg --no-backup --replace *.h