projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Makfile: fix linking error + remove EOL whitespace
[model-checker.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index fcd7b5c311d85be581c7dc2eda1bc4378047a2c3..54dcad14df741a6e3d5d9a8fff073f48f9f33cbc 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-25,7
+25,7
@@
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)
- $(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) -l$(LIB_MEM) $(CPPFLAGS)
+ $(CXX) -o $(BIN) $(USER_O) -L. -l$(LIB_NAME) -l$(LIB_MEM) $(CPPFLAGS)
$(LDFLAGS)
# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
# note: implicit rule for generating $(USER_O) (i.e., userprog.c -> userprog.o)
@@
-39,7
+39,7
@@
malloc.o: malloc.c
$(CC) $(MEMCPPFLAGS) -DMSPACES -DONLY_MSPACES malloc.c
mymemory.o: mymemory.h snapshotimp.h mymemory.cc
$(CC) $(MEMCPPFLAGS) -DMSPACES -DONLY_MSPACES malloc.c
mymemory.o: mymemory.h snapshotimp.h mymemory.cc
- $(CXX) $(MEMCPPFLAGS) mymemory.cc
+ $(CXX) $(MEMCPPFLAGS) mymemory.cc
snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
$(CXX) $(MEMCPPFLAGS) snapshot.cc
snapshot.o: mymemory.h snapshot.h snapshotimp.h snapshot.cc
$(CXX) $(MEMCPPFLAGS) snapshot.cc