X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=3129a8e44693c5676da63d9e2958a6f29a8e9897;hp=d134f02037c0fb83c03112501e4da736a1ec617b;hb=c40837f4351cd99154b3f244860c03f5b0afe2ff;hpb=c5bccfe70ac59fc1b6c32708805be22519e1a6ba

diff --git a/Makefile b/Makefile
index d134f020..3129a8e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,54 @@
-CC=g++
+CC=gcc
+CXX=g++
+
 BIN=model
-SOURCE=libthreads.cc schedule.cc libatomic.cc userprog.c model.cc malloc.c threads.cc tree.cc
-HEADERS=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h
-FLAGS=-Wall -ldl -g
+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
+
+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
+LDFLAGS=-ldl -lrt
+
+MEMCPPFLAGS=-fPIC -g -c -Wall
+all: $(BIN)
+
+$(BIN): $(USER_O) $(LIB_SO) $(LIB_MEM_SO)
+	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) -l$(LIB_MEM) $(CPPFLAGS)
+
+# 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_MEM_SO): $(SHMEM_O) $(SHMEM_H)
+	$(CC) -shared -W1,rpath,"." -o $(LIB_MEM_SO) $(SHMEM_O)
+
+malloc.o: malloc.c
+	$(CC) $(MEMCPPFLAGS) -DMSPACES -DONLY_MSPACES malloc.c
+
+mymemory.o: mymemory.h snapshotimp.h mymemory.cc
+	$(CXX) $(MEMCPPFLAGS) mymemory.cc 
 
-all: ${BIN}
+snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
+	$(CXX) $(MEMCPPFLAGS) snapshot.cc
 
-${BIN}: ${SOURCE} ${HEADERS}
-	${CC} -o ${BIN} ${SOURCE} ${FLAGS}
+$(MODEL_O): $(MODEL_CC) $(MODEL_H)
+	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
 
 clean:
-	rm -f ${BIN} *.o
+	rm -f $(BIN) *.o *.so
 
 tags::
 	ctags -R