X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=7c73b9ba92ab8744b55598a3d57a6436e26238d2;hb=b796e8fd2555099af225ee1c3f9194bc14f6fa15;hp=3c5128545481c917983c17750d421590f5520bc8;hpb=6e0d0a36ea0f00925308504a44c7b690a9a1d6b7;p=c11tester.git

diff --git a/Makefile b/Makefile
index 3c512854..7c73b9ba 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,9 @@ 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 execution.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 \
+	   sleeps.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS := -ldl -lrt -rdynamic
@@ -32,10 +33,13 @@ 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)
 
@@ -62,7 +66,8 @@ tags:
 	ctags -R
 
 PHONY += tests
-tests: $(LIB_SO)	# $(MAKE) -C $(TESTS_DIR)
+tests: $(LIB_SO)
+#	$(MAKE) -C $(TESTS_DIR)
 
 BENCH_DIR := benchmarks
 
@@ -84,3 +89,7 @@ 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