Makfile: remove MEMCPPFLAGS, more uniform command format

[model-checker.git] / Makefile

diff --git a/Makefile b/Makefile
index 8344effd65c0bc1ab51863901cd19eea584ebf74..1326dc0048e68d5cbd6f03de2388ebe3f10d41bc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,9 +10,9 @@ 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 main.cc snapshot-interface.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o threads.o tree.o librace.o action.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 snapshot-interface.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
 
 SHMEM_CC=snapshot.cc malloc.c mymemory.cc
 SHMEM_O=snapshot.o malloc.o mymemory.o
@@ -21,11 +21,10 @@ SHMEM_H=snapshot.h snapshotimp.h mymemory.h
 CPPFLAGS=-Wall -g
 LDFLAGS=-ldl -lrt
 
-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)
+       $(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)
 
@@ -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) $(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)