X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=4329fc46d50542fd0106c184f7c2a3ab705ea878;hp=7a21be3dc9be9d482623ed80017897e80ce025ca;hb=a72579537233ec7d21ac24d895b9cbe7cfe16f2d;hpb=ee840c902aec5c8becf8051eca7fe2b82b8ddc5b

diff --git a/Makefile b/Makefile
index 7a21be3d..4329fc46 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,100 @@
-CC=gcc
-CXX=g++
+include common.mk
 
-LIB_NAME=model
-LIB_SO=lib$(LIB_NAME).so
+OBJECTS := libthreads.o schedule.o model.o threads.o librace.o action.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 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
 
+CPPFLAGS += -Iinclude -I.
+LDFLAGS := -ldl -lrt -rdynamic -lpthread
+SHARED := -shared
 
-MODEL_CC=libthreads.cc schedule.cc model.cc threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc cyclegraph.cc datarace.cc impatomic.cc cmodelint.cc promise.cc
-MODEL_O=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 promise.o
-MODEL_H=libthreads.h schedule.h common.h model.h threads.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h cyclegraph.h hashtable.h datarace.h config.h include/impatomic.h include/cstdatomic include/stdatomic.h cmodelint.h promise.h
+# Mac OSX options
+ifeq ($(UNAME), Darwin)
+LDFLAGS := -ldl
+SHARED := -Wl,-undefined,dynamic_lookup -dynamiclib
+endif
 
-SHMEM_CC=snapshot.cc malloc.c mymemory.cc
-SHMEM_O=snapshot.o malloc.o mymemory.o
-SHMEM_H=snapshot.h snapshotimp.h mymemory.h
+TESTS_DIR := test
 
-CPPFLAGS=-Wall -g -O0 -Iinclude -I.
-LDFLAGS=-ldl -lrt
-SHARED=-shared
+MARKDOWN := doc/Markdown/Markdown.pl
 
-all: $(LIB_SO)
+all: $(LIB_SO) tests README.html
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
-mac: LDFLAGS=-ldl
-mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
-mac: all
-
-docs: *.c *.cc *.h
+PHONY += docs
+docs: *.c *.cc *.h README.html
 	doxygen
 
-$(LIB_SO): $(MODEL_O) $(MODEL_H) $(SHMEM_O) $(SHMEM_H)
-	$(CXX) $(SHARED) -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(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=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)
 
-mymemory.o: mymemory.h snapshotimp.h snapshot.h mymemory.cc
-	$(CXX) -fPIC -c mymemory.cc $(CPPFLAGS)
 
-snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
-	$(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
+$(LIB_SO): $(OBJECTS)
+	$(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
 
-%.o: %.cc $(MODEL_H)
-	$(CXX) -fPIC -c $< $(CPPFLAGS)
+%.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
 mrclean: clean
 	rm -rf docs
 
-tags::
+PHONY += tags
+tags:
 	ctags -R
+
+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}'
+
+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/*
+