X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=Makefile;h=620a9ecd91353b6aab6484e409f6adef8fc23bc7;hb=4019d34cdcee6193a6964bd995ded65f049d58ce;hp=f6a0837eea4e38f076da313859eeedff14eaf6d9;hpb=70515e16c177a40e1053285262ff34e10c33e57e;p=c11tester.git

diff --git a/Makefile b/Makefile
index f6a0837e..620a9ecd 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ 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 \
-	  snapshot.o malloc.o mymemory.o common.o
+	  snapshot.o malloc.o mymemory.o common.o mutex.o
 
 CPPFLAGS += -Iinclude -I. -rdynamic
 LDFLAGS = -ldl -lrt
@@ -11,7 +11,6 @@ SHARED = -shared
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
-CPPFLAGS += -D_XOPEN_SOURCE -DMAC
 LDFLAGS = -ldl
 SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
@@ -27,10 +26,7 @@ all: $(LIB_SO) $(DEPS) tests
 $(DEPS): $(program_C_SRCS) $(program_H_SRCS)
 	$(CXX) -MM $(program_C_SRCS) $(CPPFLAGS) > $(DEPS)
 
-# Only include, rebuild make.deps when it's going to be used
-ifeq ($(MAKECMDGOALS),$(DEPS))
 include $(DEPS)
-endif
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
@@ -47,15 +43,21 @@ malloc.o: malloc.c
 %.o: %.cc
 	$(CXX) -fPIC -c $< $(CPPFLAGS)
 
+PHONY += clean
 clean:
 	rm -f *.o *.so
 	$(MAKE) -C $(TESTS_DIR) clean
 
+PHONY += mrclean
 mrclean: clean
 	rm -rf docs
 
-tags::
+PHONY += tags
+tags:
 	ctags -R
 
-tests:: $(LIB_SO)
+PHONY += tests
+tests: $(LIB_SO)
 	$(MAKE) -C $(TESTS_DIR)
+
+.PHONY: $(PHONY)