X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=657bad6559ed259db5ec0f28cb966a4293b02de8;hp=ddc89cb2440926aaf0551084fe89c88a3e2bbdfa;hb=dfce798347b60b1bff6df0cdb51b786f4ca02d7f;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a

diff --git a/Makefile b/Makefile
index ddc89cb2..657bad65 100644
--- a/Makefile
+++ b/Makefile
@@ -1,63 +1,76 @@
-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 threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc cyclegraph.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o threads.o librace.o action.o nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o
-MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h cyclegraph.h hashtable.h
+# Mac OSX options
+ifeq ($(UNAME), Darwin)
+LDFLAGS = -ldl
+SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
+endif
 
-SHMEM_CC=snapshot.cc malloc.c mymemory.cc
-SHMEM_O=snapshot.o malloc.o mymemory.o
-SHMEM_H=snapshot.h snapshotimp.h mymemory.h
+TESTS_DIR = test
 
-CPPFLAGS=-Wall -g -O0
-LDFLAGS=-ldl -lrt
-SHARED=-shared
+program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
+program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
+DEPS = make.deps
 
-all: $(BIN)
+all: $(LIB_SO) $(DEPS) tests
+
+$(DEPS): $(program_C_SRCS) $(program_H_SRCS)
+	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
+
+include $(DEPS)
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
-mac: LDFLAGS=-ldl
-mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
-mac: all
-
+PHONY += docs
 docs: *.c *.cc *.h
 	doxygen
 
-$(BIN): $(USER_O) $(LIB_SO)
-	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME)
-
-# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
-
-$(LIB_SO): $(MODEL_O) $(MODEL_H) $(SHMEM_O) $(SHMEM_H)
-	$(CXX) $(SHARED) -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(LDFLAGS)
+$(LIB_SO): $(OBJECTS)
+	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
 
 malloc.o: malloc.c
-	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
-
-mymemory.o: mymemory.h snapshotimp.h snapshot.h mymemory.cc
-	$(CXX) -fPIC -c mymemory.cc $(CPPFLAGS)
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable -Wno-self-assign
 
-snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
-	$(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
-
-$(MODEL_O): $(MODEL_CC) $(MODEL_H)
-	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
+%.o: %.cc
+	$(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)