X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=adb080de5d44871596ee201fb659666684645bbc;hb=193c917736aedbc4b34e6cae3e6eb35eb5e98502;hp=eb84076dcae075324dc3353d52d72617c578fcfe;hpb=a65e234b607444355eb6e34097ee55ba93d4c01b;p=c11tester.git

diff --git a/Makefile b/Makefile
index eb84076d..adb080de 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 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 \
+	   clockvector.o main.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 \
+	   sleeps.o history.o funcnode.o funcinst.o predicate.o printf.o newfuzzer.o \
+	   concretepredicate.o waitobj.o hashfunction.o pipe.o actionlist.o
 
-CPPFLAGS += -Iinclude -I. -I$(SCFENCE_DIR)
-LDFLAGS := -ldl -lrt -rdynamic
+CPPFLAGS += -Iinclude -I.
+LDFLAGS := -ldl -lrt -rdynamic -lpthread
 SHARED := -shared
 
 # Mac OSX options
@@ -18,11 +18,9 @@ LDFLAGS := -ldl
 SHARED := -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
 
-TESTS_DIR := test
-
 MARKDOWN := doc/Markdown/Markdown.pl
 
-all: $(LIB_SO) tests README.html
+all: $(LIB_SO) README.html
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -34,16 +32,18 @@ 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)
 
-include $(SCFENCE_DIR)/Makefile
-
--include $(wildcard $(SCFENCE_DIR)/.*.d)
 
 $(LIB_SO): $(OBJECTS)
 	$(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
@@ -55,8 +55,7 @@ $(LIB_SO): $(OBJECTS)
 
 PHONY += clean
 clean:
-	rm -f *.o *.so .*.d *.pdf *.dot $(SCFENCE_DIR)/.*.d $(SCFENCE_DIR)/*.o
-	$(MAKE) -C $(TESTS_DIR) clean
+	rm -f *.o *.so .*.d *.pdf *.dot
 
 PHONY += mrclean
 mrclean: clean
@@ -66,10 +65,6 @@ PHONY += tags
 tags:
 	ctags -R
 
-PHONY += tests
-tests: $(LIB_SO)
-	$(MAKE) -C $(TESTS_DIR)
-
 BENCH_DIR := benchmarks
 
 PHONY += benchmarks
@@ -90,3 +85,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/*
+