projects
/
cdsspec-compiler.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
72e4ac7
)
Makfile: remove MEMCPPFLAGS, more uniform command format
author
Brian Norris
<banorris@uci.edu>
Mon, 21 May 2012 16:38:50 +0000
(09:38 -0700)
committer
Brian Norris
<banorris@uci.edu>
Mon, 21 May 2012 16:38:50 +0000
(09:38 -0700)
Makefile
patch
|
blob
|
history
diff --git
a/Makefile
b/Makefile
index 54dcad14df741a6e3d5d9a8fff073f48f9f33cbc..1326dc0048e68d5cbd6f03de2388ebe3f10d41bc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-21,7
+21,6
@@
SHMEM_H=snapshot.h snapshotimp.h mymemory.h
CPPFLAGS=-Wall -g
LDFLAGS=-ldl -lrt
CPPFLAGS=-Wall -g
LDFLAGS=-ldl -lrt
-MEMCPPFLAGS=-fPIC -g -c -Wall
all: $(BIN)
$(BIN): $(USER_O) $(LIB_SO) $(LIB_MEM_SO)
all: $(BIN)
$(BIN): $(USER_O) $(LIB_SO) $(LIB_MEM_SO)
@@
-36,13
+35,13
@@
$(LIB_MEM_SO): $(SHMEM_O) $(SHMEM_H)
$(CC) -shared -W1,rpath,"." -o $(LIB_MEM_SO) $(SHMEM_O)
malloc.o: malloc.c
$(CC) -shared -W1,rpath,"." -o $(LIB_MEM_SO) $(SHMEM_O)
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
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
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)
$(MODEL_O): $(MODEL_CC) $(MODEL_H)
$(CXX) -fPIC -c $(MODEL_CC) $(CPPFLAGS)