X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=f6a0837eea4e38f076da313859eeedff14eaf6d9;hp=7a442bdf466ad0ac405e507de37382cc33eee9a0;hb=70515e16c177a40e1053285262ff34e10c33e57e;hpb=8e649bb08299bf12cc4e50ffd5f956a4faf32f8f

diff --git a/Makefile b/Makefile
index 7a442bdf..f6a0837e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,61 @@
-CC=g++
-BIN=libthreads
-SOURCE=libthreads.cc schedule.cc libatomic.cc userprog.c model.cc malloc.c
-HEADERS=libthreads.h schedule.h common.h libatomic.h model.h threads_internal.h
-FLAGS=-Wall -ldl
+include common.mk
 
-all: ${BIN}
+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
 
-${BIN}: ${SOURCE} ${HEADERS}
-	${CC} -o ${BIN} ${SOURCE} ${FLAGS}
+CPPFLAGS += -Iinclude -I. -rdynamic
+LDFLAGS = -ldl -lrt
+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)
+
+# Only include, rebuild make.deps when it's going to be used
+ifeq ($(MAKECMDGOALS),$(DEPS))
+include $(DEPS)
+endif
+
+debug: CPPFLAGS += -DCONFIG_DEBUG
+debug: all
+
+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 $(CPPFLAGS)
+
+%.o: %.cc
+	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
 clean:
-	rm -f ${BIN} *.o
+	rm -f *.o *.so
+	$(MAKE) -C $(TESTS_DIR) clean
+
+mrclean: clean
+	rm -rf docs
 
 tags::
 	ctags -R
+
+tests:: $(LIB_SO)
+	$(MAKE) -C $(TESTS_DIR)