X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=dfa836a5259e7fac0889a3d1b4af80d3d2735f7b;hb=HEAD;hp=f44a8953ff12bde501fbd91d966f784b75a3b864;hpb=2d0d4ac38e05905a6633b3f2d5112ccadd45c27f;p=c11tester.git

diff --git a/Makefile b/Makefile
index f44a8953..dfa836a5 100644
--- 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 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 printf.o \
+	   hashfunction.o pipe.o epoll.o actionlist.o
 
 CPPFLAGS += -Iinclude -I.
-LDFLAGS := -ldl -lrt -rdynamic
+LDFLAGS := -ldl -lrt -rdynamic -lpthread
 SHARED := -shared
 
 # Mac OSX options
@@ -16,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
@@ -32,15 +32,22 @@ docs: *.c *.cc *.h README.html
 README.html: README.md
 	$(MARKDOWN) $< > $@
 
-$(LIB_SO): $(OBJECTS)
-	$(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
-
 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
 
-%.o: %.cc
+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)
 
+
+$(LIB_SO): $(OBJECTS)
+	$(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
+
 %.pdf: %.dot
 	dot -Tpdf $< -o $@
 
@@ -49,7 +56,6 @@ malloc.o: malloc.c
 PHONY += clean
 clean:
 	rm -f *.o *.so .*.d *.pdf *.dot
-	$(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean
 mrclean: clean
@@ -59,10 +65,6 @@ PHONY += tags
 tags:
 	ctags -R
 
-PHONY += tests
-tests: $(LIB_SO)
-	$(MAKE) -C $(TESTS_DIR)
-
 BENCH_DIR := benchmarks
 
 PHONY += benchmarks
@@ -83,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/*
+