X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=d530fee70ca50bb1702c7c098c565c6cdf28edb9;hb=1b793f0683aff025afe2e19519572e3599575a19;hp=9812ab47519c10831ad4aff9a1588026479d2c8a;hpb=fec9254c3747d5dde5d45e1ef81f7261c74bd5a7;p=model-checker.git

diff --git a/Makefile b/Makefile
index 9812ab4..d530fee 100644
--- a/Makefile
+++ b/Makefile
@@ -2,14 +2,20 @@ include common.mk
 
 OBJECTS = libthreads.o schedule.o model.o threads.o librace.o action.o \
 	  nodestack.o clockvector.o main.o snapshot-interface.o cyclegraph.o \
-	  datarace.o impatomic.o cmodelint.o promise.o \
-	  snapshot.o malloc.o mymemory.o
+	  datarace.o impatomic.o cmodelint.o \
+	  snapshot.o malloc.o mymemory.o common.o mutex.o promise.o
 
-CPPFLAGS += -Iinclude -I.
-LDFLAGS=-ldl -lrt
-SHARED=-shared
+CPPFLAGS += -Iinclude -I. -rdynamic
+LDFLAGS = -ldl -lrt
+SHARED = -shared
 
-TESTS=test
+# Mac OSX options
+ifeq ($(UNAME), Darwin)
+LDFLAGS = -ldl
+SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
+endif
+
+TESTS_DIR = test
 
 program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
 program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)
@@ -18,18 +24,14 @@ DEPS = make.deps
 all: $(LIB_SO) $(DEPS) tests
 
 $(DEPS): $(program_C_SRCS) $(program_H_SRCS)
-	$(CXX) $(CPPFLAGS) -MM $(program_C_SRCS) > $(DEPS)
+	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
 
 include $(DEPS)
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC
-mac: LDFLAGS=-ldl
-mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
-mac: all
-
+PHONY += docs
 docs: *.c *.cc *.h
 	doxygen
 
@@ -37,20 +39,26 @@ $(LIB_SO): $(OBJECTS)
 	$(CXX) $(SHARED) -o $(LIB_SO) $(OBJECTS) $(LDFLAGS)
 
 malloc.o: malloc.c
-	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES $(CPPFLAGS)
+	$(CC) -fPIC -c malloc.c -DMSPACES -DONLY_MSPACES -DHAVE_MMAP=0 $(CPPFLAGS) -Wno-unused-variable
 
 %.o: %.cc
 	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
+PHONY += clean
 clean:
 	rm -f *.o *.so
-	$(MAKE) -C $(TESTS) clean
+	$(MAKE) -C $(TESTS_DIR) clean
 
+PHONY += mrclean
 mrclean: clean
 	rm -rf docs
 
-tags::
+PHONY += tags
+tags:
 	ctags -R
 
-tests:: $(LIB_SO)
-	$(MAKE) -C $(TESTS)
+PHONY += tests
+tests: $(LIB_SO)
+	$(MAKE) -C $(TESTS_DIR)
+
+.PHONY: $(PHONY)