projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hack some stuff towards running on mac... unrelated bugs still..
[c11tester.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 1326dc0048e68d5cbd6f03de2388ebe3f10d41bc..203ed68e347b1bb80da6de7d98eb9da1aad9cace 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,36
+3,40
@@
CXX=g++
BIN=model
LIB_NAME=model
BIN=model
LIB_NAME=model
-LIB_MEM=mymemory
LIB_SO=lib$(LIB_NAME).so
LIB_SO=lib$(LIB_NAME).so
-LIB_MEM_SO=lib$(LIB_MEM).so
USER_O=userprog.o
USER_H=libthreads.h libatomic.h
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
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
LDFLAGS=-ldl -lrt
+SHARED=-shared
all: $(BIN)
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
+
+$(BIN): $(USER_O) $(LIB_SO)
+ $(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME)
-$(LIB_SO): $(MODEL_O) $(MODEL_H)
- $(CXX) -shared -Wl,-soname,$(LIB_SO) -o $(LIB_SO) $(MODEL_O) $(LDFLAGS) $(CPPFLAGS)
+# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
-$(LIB_
MEM_SO):
$(SHMEM_O) $(SHMEM_H)
- $(C
C) -shared -W1,rpath,"." -o $(LIB_MEM_SO) $(SHMEM_O
)
+$(LIB_
SO): $(MODEL_O) $(MODEL_H)
$(SHMEM_O) $(SHMEM_H)
+ $(C
XX) $(SHARED) -o $(LIB_SO) $(MODEL_O) $(SHMEM_O) $(LDFLAGS
)
malloc.o: malloc.c
$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
malloc.o: malloc.c
$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)