refactor choices into own class

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index 37bdcd11ce415d4eb5eafdee8791b5458fa21837..5411f5838b1802ac45a712bcbff5c5b0f1c93831 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,8 @@ 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 scanalysis.o execution.o plugins.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
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic
@@ -32,15 +32,20 @@ docs: *.c *.cc *.h README.html
 README.html: README.md
        $(MARKDOWN) $< > $@
 
-$(LIB_SO): $(OBJECTS)
-       $(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
-
 malloc.o: malloc.c
        $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
-%.o: %.cc
+futex.o: futex.cc
+       $(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
+
+
+%.o : %.cc
        $(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
 
+
+$(LIB_SO): $(OBJECTS)
+       $(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
+
 %.pdf: %.dot
        dot -Tpdf $< -o $@
 
@@ -61,7 +66,7 @@ tags:
 
 PHONY += tests
 tests: $(LIB_SO)
-       $(MAKE) -C $(TESTS_DIR)
+#      $(MAKE) -C $(TESTS_DIR)
 
 BENCH_DIR := benchmarks