X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=Makefile;h=1f91c5dd6b86b22182c0813e0d2906bfbed7664d;hp=efa75ffe21b2cce497b3301428afdf2c25853f70;hb=7af1e278a823b97b391f37da9ef6a013d58ac50e;hpb=da61ddf6a9c25972b990e5b018191711f12c63aa

diff --git a/Makefile b/Makefile
index efa75ffe..1f91c5dd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,35 @@
 CC=gcc
-BIN=libthreads
-SOURCE=libthreads.c schedule.c
-HEADERS=libthreads.h schedule.h common.h
-FLAGS=
+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
+
+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