X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=2d90c16b4e55ad7bcc2046395af266caa9d1f712;hb=9616c78511982c9e7205273460ad96210577ebb6;hp=3129a8e44693c5676da63d9e2958a6f29a8e9897;hpb=c40837f4351cd99154b3f244860c03f5b0afe2ff;p=model-checker.git

diff --git a/Makefile b/Makefile
index 3129a8e..2d90c16 100644
--- a/Makefile
+++ b/Makefile
@@ -1,54 +1,56 @@
-CC=gcc
-CXX=g++
+include common.mk
 
-BIN=model
-LIB_NAME=model
-LIB_MEM=mymemory
-LIB_SO=lib$(LIB_NAME).so
-LIB_MEM_SO=lib$(LIB_MEM).so
-
-USER_O=userprog.o
-USER_H=libthreads.h libatomic.h
-
-MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc threads.cc tree.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc mallocwrap.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o threads.o tree.o librace.o action.o nodestack.o clockvector.o main.o snapshot-interface.o mallocwrap.o
-MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h
+MODEL_CC=libthreads.cc schedule.cc model.cc threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc cyclegraph.cc datarace.cc impatomic.cc cmodelint.cc promise.cc
+MODEL_O=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 promise.o
+MODEL_H=libthreads.h schedule.h common.h model.h threads.h librace.h action.h nodestack.h clockvector.h snapshot-interface.h cyclegraph.h hashtable.h datarace.h config.h include/impatomic.h include/cstdatomic include/stdatomic.h cmodelint.h promise.h
 
 SHMEM_CC=snapshot.cc malloc.c mymemory.cc
 SHMEM_O=snapshot.o malloc.o mymemory.o
-SHMEM_H=snapshot.h snapshotimp.h mymemory.h
+SHMEM_H=snapshot.h snapshotimp.h mymemory.h config.h
 
-CPPFLAGS=-Wall -g
+CPPFLAGS += -Iinclude -I.
 LDFLAGS=-ldl -lrt
+SHARED=-shared
+
+TESTS=test
 
-MEMCPPFLAGS=-fPIC -g -c -Wall
-all: $(BIN)
+all: $(LIB_SO) tests
 
-$(BIN): $(USER_O) $(LIB_SO) $(LIB_MEM_SO)
-	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) -l$(LIB_MEM) $(CPPFLAGS)
+debug: CPPFLAGS += -DCONFIG_DEBUG
+debug: all
 
-# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
+mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
+mac: LDFLAGS=-ldl
+mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
+mac: all
 
-$(LIB_SO): $(MODEL_O) $(MODEL_H)
-	$(CXX) -shared -Wl,-soname,$(LIB_SO) -o $(LIB_SO) $(MODEL_O) $(LDFLAGS) $(CPPFLAGS)
+docs: *.c *.cc *.h
+	doxygen
 
-$(LIB_MEM_SO): $(SHMEM_O) $(SHMEM_H)
-	$(CC) -shared -W1,rpath,"." -o $(LIB_MEM_SO) $(SHMEM_O)
+$(LIB_SO): $(MODEL_O) $(MODEL_H) $(SHMEM_O) $(SHMEM_H)
+	$(CXX) $(SHARED) -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(LDFLAGS)
 
 malloc.o: malloc.c
-	$(CC) $(MEMCPPFLAGS) -DMSPACES -DONLY_MSPACES malloc.c
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
 
-mymemory.o: mymemory.h snapshotimp.h mymemory.cc
-	$(CXX) $(MEMCPPFLAGS) mymemory.cc 
+mymemory.o: mymemory.h snapshotimp.h snapshot.h mymemory.cc config.h
+	$(CXX) -fPIC -c mymemory.cc $(CPPFLAGS)
 
-snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
-	$(CXX) $(MEMCPPFLAGS) snapshot.cc
+snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc config.h
+	$(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
 
-$(MODEL_O): $(MODEL_CC) $(MODEL_H)
-	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
+%.o: %.cc $(MODEL_H)
+	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
 clean:
-	rm -f $(BIN) *.o *.so
+	rm -f *.o *.so
+	$(MAKE) -C $(TESTS) clean
+
+mrclean: clean
+	rm -rf docs
 
 tags::
 	ctags -R
+
+tests:: $(LIB_SO)
+	$(MAKE) -C $(TESTS)