Fix snapshot code

[model-checker.git] / Makefile

diff --git a/Makefile b/Makefile
index 26aadc9629a950fc7db6f17755a50c826810f183..eb84076dcae075324dc3353d52d72617c578fcfe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,41 +1,53 @@
 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 \
-         context.o scanalysis.o execution.o
+SCFENCE_DIR := scfence
 
-CPPFLAGS += -Iinclude -I.
-LDFLAGS = -ldl -lrt -rdynamic
-SHARED = -shared
+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 libannotate.o
+
+CPPFLAGS += -Iinclude -I. -I$(SCFENCE_DIR)
+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
+
+MARKDOWN := doc/Markdown/Markdown.pl
 
-all: $(LIB_SO) tests
+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
 
-$(LIB_SO): $(OBJECTS)
-       $(CXX) $(SHARED) -o $(LIB_SO) $+ $(LDFLAGS)
+README.html: README.md
+       $(MARKDOWN) $< > $@
+
 
 malloc.o: malloc.c
        $(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
-%.o: %.cc
+%.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)
+
 %.pdf: %.dot
        dot -Tpdf $< -o $@
 
@@ -43,7 +55,7 @@ malloc.o: malloc.c
 
 PHONY += clean
 clean:
-       rm -f *.o *.so .*.d *.pdf *.dot
+       rm -f *.o *.so .*.d *.pdf *.dot $(SCFENCE_DIR)/.*.d $(SCFENCE_DIR)/*.o
        $(MAKE) -C $(TESTS_DIR) clean
 
 PHONY += mrclean
@@ -74,3 +86,7 @@ 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}'