X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=Makefile;h=0f9bf00389680e32971f710b3d1ae88ee4eb262c;hb=e759b60e0b2dc31623ba3b03303a9d0d204fdd4c;hp=6c52f671d92023ca361bf395fbe5677986c8e3a4;hpb=bb44088ca96e320475d4ebd11f8868ac4b452fbb;p=model-checker.git

diff --git a/Makefile b/Makefile
index 6c52f67..0f9bf00 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,35 @@
-CC=g++
-BIN=libthreads
-SOURCE=libthreads.c schedule.c libatomic.c userprog.c model.cc
-HEADERS=libthreads.h schedule.h common.h libatomic.h model.h
-FLAGS=-Wall
+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 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
+
+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