X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=26aadc9629a950fc7db6f17755a50c826810f183;hb=7f076cdf802fbb01682dc954d0d4afb26ba031a7;hp=c363876dfd3fef30a0f2a3ecef3832949854c023;hpb=dacd717b37c9043818e9dbd512a8e77e5ec736a1;p=model-checker.git

diff --git a/Makefile b/Makefile
index c363876..26aadc9 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,8 @@ 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
+	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o \
+	  context.o scanalysis.o execution.o
 
 CPPFLAGS += -Iinclude -I.
 LDFLAGS = -ldl -lrt -rdynamic
@@ -17,20 +18,8 @@ endif
 
 TESTS_DIR = test
 
-program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
-program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
-DEPS = make.deps
-
 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
-
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
@@ -39,17 +28,22 @@ docs: *.c *.cc *.h
 	doxygen
 
 $(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
@@ -64,16 +58,19 @@ PHONY += tests
 tests: $(LIB_SO)
 	$(MAKE) -C $(TESTS_DIR)
 
-BENCHMARKS := benchmarks
+BENCH_DIR := benchmarks
 
 PHONY += benchmarks
 benchmarks: $(LIB_SO)
-	@if ! test -d $(BENCHMARKS); then \
-		echo "Directory $(BENCHMARKS) does not exist" && \
+	@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 $(BENCHMARKS)
+	$(MAKE) -C $(BENCH_DIR)
+
+PHONY += pdfs
+pdfs: $(patsubst %.dot,%.pdf,$(wildcard *.dot))
 
 .PHONY: $(PHONY)