X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=37bdcd11ce415d4eb5eafdee8791b5458fa21837;hb=1f2a30ddc8f38f3f45d62d169b766c0c38364ecd;hp=9b20f4c8a65632c7d0f1c25e18417b38724c9ff2;hpb=dcf7f575967bec560d500cc4f52e35c21671525c;p=model-checker.git

diff --git a/Makefile b/Makefile
index 9b20f4c..37bdcd1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,54 @@
 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
+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 scanalysis.o execution.o plugins.o
 
 CPPFLAGS += -Iinclude -I.
-LDFLAGS = -ldl -lrt -rdynamic
-SHARED = -shared
+LDFLAGS := -ldl -lrt -rdynamic
+SHARED := -shared
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
-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) tests
-
-$(DEPS): build_deps := 1
-$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
-	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
-
-ifeq ($(build_deps),1)
-include $(DEPS)
-endif
+all: $(LIB_SO) tests README.html
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
 PHONY += docs
-docs: *.c *.cc *.h
+docs: *.c *.cc *.h README.html
 	doxygen
 
+README.html: README.md
+	$(MARKDOWN) $< > $@
+
 $(LIB_SO): $(OBJECTS)
-	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
+	$(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
 
-%.o: %.cc $(DEPS)
-	$(CXX) -fPIC -c $< $(CPPFLAGS)
+%.o: %.cc
+	$(CXX) -MMD -MF .$@.d -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
@@ -76,4 +75,11 @@ benchmarks: $(LIB_SO)
 	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}'