Fix methods

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index 20e4d578701f9e78d5f983d38f3e0c8f1839429d..f9d34249619660effdb7d03b74d65d54463259fb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,13 +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
+          context.o execution.o libannotate.o plugins.o pthread.o futex.o fuzzer.o \
+          sleeps.o history.o funcnode.o funcinst.o predicate.o printf.o newfuzzer.o \
+          concretepredicate.o waitobj.o
 
 CPPFLAGS += -Iinclude -I.
-LDFLAGS := -ldl -lrt -rdynamic
+LDFLAGS := -ldl -lrt -rdynamic -lpthread
 SHARED := -shared
 
 # Mac OSX options
@@ -33,12 +35,14 @@ 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)
 
-
 %.o : %.cc
        $(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
 
@@ -90,5 +94,7 @@ pdfs: $(patsubst %.dot,%.pdf,$(wildcard *.dot))
        pandoc -o $@ $< -V header-includes='\usepackage[margin=1in]{geometry}'
 
 tabbing:
-       uncrustify -c C.cfg --no-backup *.cc
-       uncrustify -c C.cfg --no-backup *.h
+       uncrustify -c C.cfg --no-backup --replace *.cc
+       uncrustify -c C.cfg --no-backup --replace *.h
+       uncrustify -c C.cfg --no-backup --replace include/*
+