X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=2d3161179c45a4a650402140ffaa6bfdf32d9e43;hb=84e24d516d4e9dbd30f1fff7e9a185d1540d20eb;hp=0f9bf00389680e32971f710b3d1ae88ee4eb262c;hpb=e759b60e0b2dc31623ba3b03303a9d0d204fdd4c;p=model-checker.git

diff --git a/Makefile b/Makefile
index 0f9bf00..2d31611 100644
--- a/Makefile
+++ b/Makefile
@@ -6,30 +6,58 @@ LIB_NAME=model
 LIB_SO=lib$(LIB_NAME).so
 
 USER_O=userprog.o
-USER_H=libthreads.h libatomic.h
+USER_H=libthreads.h
 
-MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc malloc.c threads.cc tree.cc librace.cc action.cc main.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o malloc.o threads.o tree.o librace.o action.o main.o
-MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h librace.h action.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
+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
+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
 
-CPPFLAGS=-Wall -g
-LDFLAGS=-ldl
+SHMEM_CC=snapshot.cc malloc.c mymemory.cc
+SHMEM_O=snapshot.o malloc.o mymemory.o
+SHMEM_H=snapshot.h snapshotimp.h mymemory.h
+
+CPPFLAGS=-Wall -g -O0 -Iinclude -I.
+LDFLAGS=-ldl -lrt
+SHARED=-shared
 
 all: $(BIN)
 
+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
+
 $(BIN): $(USER_O) $(LIB_SO)
-	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) $(CPPFLAGS)
+	$(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)
-	$(CXX) -shared -Wl,-soname,$(LIB_SO) -o $(LIB_SO) $(MODEL_O) $(LDFLAGS) $(CPPFLAGS)
+$(LIB_SO): $(MODEL_O) $(MODEL_H) $(SHMEM_O) $(SHMEM_H)
+	$(CXX) $(SHARED) -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(LDFLAGS)
 
-$(MODEL_O): $(MODEL_CC) $(MODEL_H)
-	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
+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)
+
+snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
+	$(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
+
+%.o: %.cc $(MODEL_H)
+	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
 clean:
 	rm -f $(BIN) *.o *.so
 
+mrclean: clean
+	rm -rf docs
+
 tags::
 	ctags -R