X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=7e07cc8f3f91f045832cd47155f14185d64e62a1;hb=f2f24fe913030cca5e14b377af732194eb7b8831;hp=54dcad14df741a6e3d5d9a8fff073f48f9f33cbc;hpb=3d3eb15b67956341e22288081ef887a281ed49e1;p=model-checker.git

diff --git a/Makefile b/Makefile
index 54dcad1..7e07cc8 100644
--- a/Makefile
+++ b/Makefile
@@ -3,46 +3,52 @@ CXX=g++
 
 BIN=model
 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
-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
-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
+MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc threads.cc librace.cc action.cc nodestack.cc clockvector.cc main.cc snapshot-interface.cc
+MODEL_O=libthreads.o schedule.o libatomic.o model.o threads.o librace.o action.o nodestack.o clockvector.o main.o snapshot-interface.o
+MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.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
+CPPFLAGS=-Wall -g -O0
 LDFLAGS=-ldl -lrt
+SHARED=-shared
 
-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) $(LDFLAGS)
+debug: CPPFLAGS += -DCONFIG_DEBUG
+debug: all
 
-# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
+mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
+mac: LDFLAGS=-ldl
+mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
+mac: all
+
+docs:
+	doxygen
 
-$(LIB_SO): $(MODEL_O) $(MODEL_H)
-	$(CXX) -shared -Wl,-soname,$(LIB_SO) -o $(LIB_SO) $(MODEL_O) $(LDFLAGS) $(CPPFLAGS)
+$(BIN): $(USER_O) $(LIB_SO)
+	$(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME)
 
-$(LIB_MEM_SO): $(SHMEM_O) $(SHMEM_H)
-	$(CC) -shared -W1,rpath,"." -o $(LIB_MEM_SO) $(SHMEM_O)
+# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
+
+$(LIB_SO): $(MODEL_O) $(MODEL_H) $(SHMEM_O) $(SHMEM_H)
+	$(CXX) $(SHARED) -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(LDFLAGS)
 
 malloc.o: malloc.c
-	$(CC) $(MEMCPPFLAGS) -DMSPACES -DONLY_MSPACES malloc.c
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
 
 mymemory.o: mymemory.h snapshotimp.h mymemory.cc
-	$(CXX) $(MEMCPPFLAGS) mymemory.cc
+	$(CXX) -fPIC -c mymemory.cc $(CPPFLAGS)
 
 snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
-	$(CXX) $(MEMCPPFLAGS) snapshot.cc
+	$(CXX) -fPIC -c snapshot.cc $(CPPFLAGS)
 
 $(MODEL_O): $(MODEL_CC) $(MODEL_H)
 	$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)
@@ -50,5 +56,8 @@ $(MODEL_O): $(MODEL_CC) $(MODEL_H)
 clean:
 	rm -f $(BIN) *.o *.so
 
+mrclean: clean
+	rm -rf docs
+
 tags::
 	ctags -R