X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=Makefile;h=7539aca6acb25facc760924f90a45949b364be0e;hp=53b0331f2a250f7a18af120f87929b4cee605fdd;hb=4541dc5155c69e168beedf3bd2a8f5ece0e0e65b;hpb=202074f941d19cef894068e7f79d76b2df598f4b

diff --git a/Makefile b/Makefile
index 53b0331..7539aca 100644
--- a/Makefile
+++ b/Makefile
@@ -3,50 +3,47 @@ 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
+	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o \
+	  context.o scanalysis.o
 
-CPPFLAGS += -Iinclude -I. -rdynamic
-LDFLAGS = -ldl -lrt
+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
 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) $(DEPS) tests
-
-$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
-	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
-
-include $(DEPS)
+all: $(LIB_SO) tests
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
+PHONY += docs
 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 $(CPPFLAGS)
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
 %.o: %.cc
-	$(CXX) -fPIC -c $< $(CPPFLAGS)
+	$(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
@@ -61,4 +58,19 @@ 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)