X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=e5fc14f78f9e97d0d2aa9c745e44e2ab6922b00f;hb=04ffc0dafb0bfa78aa73b21359ca5b53622e675d;hp=a7d2b5264c36c0fe7f5357ae82fd684995526f27;hpb=53504d64f6149c5309577ecaed42450a02e27293;p=c11tester.git

diff --git a/Makefile b/Makefile
index a7d2b526..e5fc14f7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,11 @@
 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 promise.o conditionvariable.o \
-	   context.o execution.o libannotate.o pthread.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 funcinst.o printf.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic
@@ -32,9 +33,14 @@ 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
+	$(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)
@@ -63,7 +69,7 @@ tags:
 
 PHONY += tests
 tests: $(LIB_SO)
-	$(MAKE) -C $(TESTS_DIR)
+#	$(MAKE) -C $(TESTS_DIR)
 
 BENCH_DIR := benchmarks
 
@@ -85,3 +91,9 @@ 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
+	uncrustify -c C.cfg --no-backup --replace include/*
+