X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=c363876dfd3fef30a0f2a3ecef3832949854c023;hp=4a5360d96058701c69383197a38131f409b416dd;hb=7966c737f2a88e5e1a56817eb9f6fdaead3eca92;hpb=996d51da9229031b9d7841c2f3d3b7629db2cba9

diff --git a/Makefile b/Makefile
index 4a5360d9..c363876d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,79 @@
-CC=gcc
-CXX=g++
+include common.mk
 
-BIN=model
-LIB_NAME=model
-LIB_SO=lib$(LIB_NAME).so
+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
 
-USER_O=userprog.o
-USER_H=libthreads.h libatomic.h
+CPPFLAGS += -Iinclude -I.
+LDFLAGS = -ldl -lrt -rdynamic
+SHARED = -shared
 
-MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc malloc.c threads.cc tree.cc librace.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o malloc.o threads.o tree.o librace.o
-MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h librace.h action.h
+# Mac OSX options
+ifeq ($(UNAME), Darwin)
+LDFLAGS = -ldl
+SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
+endif
 
-CPPFLAGS=-Wall -g
-LDFLAGS=-ldl
+TESTS_DIR = test
 
-all: $(BIN)
+program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
+program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
+DEPS = make.deps
 
-$(BIN): $(USER_O) $(LIB_SO)
-	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) $(CPPFLAGS)
+all: $(LIB_SO) tests
 
-# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
+$(DEPS): build_deps := 1
+$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
+	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
 
-$(LIB_SO): $(MODEL_O) $(MODEL_H)
-	$(CXX) -shared -Wl,-soname,$(LIB_SO) -o $(LIB_SO) $(MODEL_O) $(LDFLAGS) $(CPPFLAGS)
+ifeq ($(build_deps),1)
+include $(DEPS)
+endif
 
-$(MODEL_O): $(MODEL_CC) $(MODEL_H)
-	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
+debug: CPPFLAGS += -DCONFIG_DEBUG
+debug: all
 
+PHONY += docs
+docs: *.c *.cc *.h
+	doxygen
+
+$(LIB_SO): $(OBJECTS)
+	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(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)
+
+PHONY += clean
 clean:
-	rm -f $(BIN) *.o *.so
+	rm -f *.o *.so
+	$(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)
+
+BENCHMARKS := benchmarks
+
+PHONY += benchmarks
+benchmarks: $(LIB_SO)
+	@if ! test -d $(BENCHMARKS); then \
+		echo "Directory $(BENCHMARKS) does not exist" && \
+		echo "Please clone the benchmarks repository" && \
+		echo && \
+		exit 1; \
+	fi
+	$(MAKE) -C $(BENCHMARKS)
+
+.PHONY: $(PHONY)