refactor choices into own class

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index eb84076dcae075324dc3353d52d72617c578fcfe..5411f5838b1802ac45a712bcbff5c5b0f1c93831 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,12 @@
 include common.mk
 
-SCFENCE_DIR := scfence
-
 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 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
 
-CPPFLAGS += -Iinclude -I. -I$(SCFENCE_DIR)
+CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic
 SHARED := -shared
 
@@ -34,16 +32,16 @@ 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)
 
-include $(SCFENCE_DIR)/Makefile
-
--include $(wildcard $(SCFENCE_DIR)/.*.d)
 
 $(LIB_SO): $(OBJECTS)
        $(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
@@ -55,7 +53,7 @@ $(LIB_SO): $(OBJECTS)
 
 PHONY += clean
 clean:
-       rm -f *.o *.so .*.d *.pdf *.dot $(SCFENCE_DIR)/.*.d $(SCFENCE_DIR)/*.o
+       rm -f *.o *.so .*.d *.pdf *.dot
        $(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean
@@ -68,7 +66,7 @@ tags:
 
 PHONY += tests
 tests: $(LIB_SO)
-       $(MAKE) -C $(TESTS_DIR)
+#      $(MAKE) -C $(TESTS_DIR)
 
 BENCH_DIR := benchmarks