X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=657bad6559ed259db5ec0f28cb966a4293b02de8;hb=24edf5ea28ecd116c1faa76ed41de1cfbf6d6d1e;hp=ff5c7d9d26c4e28ff2a1ce8f2e1b9eed3c5790d0;hpb=a4090d03cc1a5f5bca8f10986d74b76a9bb45371;p=model-checker.git

diff --git a/Makefile b/Makefile
index ff5c7d9..657bad6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ OBJECTS = libthreads.o schedule.o model.o threads.o librace.o action.o \
 	  datarace.o impatomic.o cmodelint.o \
 	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o conditionvariable.o
 
-CPPFLAGS += -Iinclude -I. -rdynamic
-LDFLAGS = -ldl -lrt
+CPPFLAGS += -Iinclude -I.
+LDFLAGS = -ldl -lrt -rdynamic
 SHARED = -shared
 
 # Mac OSX options
@@ -39,7 +39,7 @@ $(LIB_SO): $(OBJECTS)
 	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
 
 malloc.o: malloc.c
-	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable -Wno-self-assign
 
 %.o: %.cc
 	$(CXX) -fPIC -c $< $(CPPFLAGS)