X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=4a5360d96058701c69383197a38131f409b416dd;hb=ea8f6a8adce67dbbf27b927a19fc2576cc294d23;hp=327bbb57ed9f841a4417b7918e34e03515bea73c;hpb=1064d480bed6b57e551f3c9ffe6a6d8f29ebe92e;p=model-checker.git

diff --git a/Makefile b/Makefile
index 327bbb5..4a5360d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,35 @@
-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
-FLAGS=-Wall -ldl
+CC=gcc
+CXX=g++
 
-all: ${BIN}
+BIN=model
+LIB_NAME=model
+LIB_SO=lib$(LIB_NAME).so
 
-${BIN}: ${SOURCE} ${HEADERS}
-	${CC} -o ${BIN} ${SOURCE} ${FLAGS}
+USER_O=userprog.o
+USER_H=libthreads.h libatomic.h
+
+MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc malloc.c threads.cc tree.cc librace.cc
+MODEL_O=libthreads.o schedule.o libatomic.o model.o malloc.o threads.o tree.o librace.o
+MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h librace.h action.h
+
+CPPFLAGS=-Wall -g
+LDFLAGS=-ldl
+
+all: $(BIN)
+
+$(BIN): $(USER_O) $(LIB_SO)
+	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) $(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)
+
+$(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