Change the return type of Predicate::evaluate

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index 00b99cc45a12d0b89e0c4d447b3a2fb1ef4d4c84..6a57d4a9902a469c4745c7ea20373b4ce3e8ed91 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,15 @@
 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 \
+          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 conditionvariable.o \
           context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
-          sleeps.o history.o
+          sleeps.o history.o funcnode.o funcinst.o predicate.o printf.o newfuzzer.o \
+          concretepredicate.o
 
 CPPFLAGS += -Iinclude -I.
-LDFLAGS := -ldl -lrt -rdynamic
+LDFLAGS := -ldl -lrt -rdynamic -lpthread
 SHARED := -shared
 
 # Mac OSX options
@@ -34,7 +35,10 @@ README.html: README.md
        $(MARKDOWN) $< > $@
 
 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=1 $(CPPFLAGS) -Wno-unused-variable
+
+printf.o: printf.c
+       $(CC) -fPIC -c printf.c $(CPPFLAGS)
 
 futex.o: futex.cc
        $(CXX) -fPIC -c futex.cc -std=c++11 $(CPPFLAGS)
@@ -92,3 +96,5 @@ pdfs: $(patsubst %.dot,%.pdf,$(wildcard *.dot))
 tabbing:
        uncrustify -c C.cfg --no-backup --replace *.cc
        uncrustify -c C.cfg --no-backup --replace *.h
+       uncrustify -c C.cfg --no-backup --replace include/*
+