X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=2acdbc7dff8a7738c6f99349421aa66bc97b5d5b;hp=de622ecb2b1e3eed7687165b2fa43b1ec88e1a2b;hb=9a416eb64865be1728786eb65b1c4b995cfa194d;hpb=24ac8e855acce4248271ca4a13f0dad8e74a96a4

diff --git a/Makefile b/Makefile
index de622ecb..2acdbc7d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,56 @@
-CC=g++
-BIN=model
-SOURCE=libthreads.cc schedule.cc libatomic.cc userprog.c model.cc malloc.c threads.cc
-HEADERS=libthreads.h schedule.h common.h libatomic.h model.h threads_internal.h
-FLAGS=-Wall -ldl -g
+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
 
-${BIN}: ${SOURCE} ${HEADERS}
-	${CC} -o ${BIN} ${SOURCE} ${FLAGS}
+CPPFLAGS += -Iinclude -I.
+LDFLAGS=-ldl -lrt
+SHARED=-shared
+
+TESTS=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) $(CPPFLAGS) -MM $(program_C_SRCS) > $(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
+
+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) clean
+
+mrclean: clean
+	rm -rf docs
 
 tags::
 	ctags -R
+
+tests:: $(LIB_SO)
+	$(MAKE) -C $(TESTS)