X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=a7d2b5264c36c0fe7f5357ae82fd684995526f27;hp=a732cb763ad7a8dcf1ef9900ac4473921000163c;hb=31c401a5ccee4a821e4d77f5c1f1883b1aac70e3;hpb=bd893aac350f125dc990f0ccd32b8e3cf133e2fb

diff --git a/Makefile b/Makefile
index a732cb76..a7d2b526 100644
--- a/Makefile
+++ b/Makefile
@@ -1,52 +1,56 @@
 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
+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 pthread.o
 
-CPPFLAGS += -Iinclude -I. -rdynamic
-LDFLAGS = -ldl -lrt
-SHARED = -shared
+CPPFLAGS += -Iinclude -I.
+LDFLAGS := -ldl -lrt -rdynamic
+SHARED := -shared
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
-CPPFLAGS += -D_XOPEN_SOURCE -DMAC
-LDFLAGS = -ldl
-SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
+LDFLAGS := -ldl
+SHARED := -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
 
-TESTS_DIR = test
+TESTS_DIR := test
 
-program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
-program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
-DEPS = make.deps
+MARKDOWN := doc/Markdown/Markdown.pl
 
-all: $(LIB_SO) $(DEPS) tests
-
-$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
-	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
-
-include $(DEPS)
+all: $(LIB_SO) tests README.html
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-docs: *.c *.cc *.h
+PHONY += docs
+docs: *.c *.cc *.h README.html
 	doxygen
 
-$(LIB_SO): $(OBJECTS)
-	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
+README.html: README.md
+	$(MARKDOWN) $< > $@
+
 
 malloc.o: malloc.c
-	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
-%.o: %.cc
-	$(CXX) -fPIC -c $< $(CPPFLAGS)
+%.o : %.cc
+	$(CXX) -MMD -MF .$@.d -fPIC -c $< $(CPPFLAGS)
+
+
+$(LIB_SO): $(OBJECTS)
+	$(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
+
+%.pdf: %.dot
+	dot -Tpdf $< -o $@
+
+-include $(OBJECTS:%=.%.d)
 
 PHONY += clean
 clean:
-	rm -f *.o *.so
+	rm -f *.o *.so .*.d *.pdf *.dot
 	$(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean
@@ -61,4 +65,23 @@ PHONY += tests
 tests: $(LIB_SO)
 	$(MAKE) -C $(TESTS_DIR)
 
+BENCH_DIR := benchmarks
+
+PHONY += benchmarks
+benchmarks: $(LIB_SO)
+	@if ! test -d $(BENCH_DIR); then \
+		echo "Directory $(BENCH_DIR) does not exist" && \
+		echo "Please clone the benchmarks repository" && \
+		echo && \
+		exit 1; \
+	fi
+	$(MAKE) -C $(BENCH_DIR)
+
+PHONY += pdfs
+pdfs: $(patsubst %.dot,%.pdf,$(wildcard *.dot))
+
 .PHONY: $(PHONY)
+
+# A 1-inch margin PDF generated by 'pandoc'
+%.pdf: %.md
+	pandoc -o $@ $< -V header-includes='\usepackage[margin=1in]{geometry}'