model: revert broken bugfix

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index 91acd7e8738d5a626ac90e058494ad24066bdfba..19f9a2c06900c5835fae6d256ff91d83437dbdc3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,14 @@ 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
+         snapshot.o malloc.o mymemory.o common.o mutex.o
 
-CPPFLAGS += -Iinclude -I.
+CPPFLAGS += -Iinclude -I. -rdynamic
 LDFLAGS = -ldl -lrt
 SHARED = -shared
 
 # Mac OSX options
 ifeq ($(UNAME), Darwin)
-CPPFLAGS += -D_XOPEN_SOURCE -DMAC
 LDFLAGS = -ldl
 SHARED = -Wl,-undefined,dynamic_lookup -dynamiclib
 endif
@@ -32,6 +31,7 @@ include $(DEPS)
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
+PHONY += docs
 docs: *.c *.cc *.h
        doxygen
 
@@ -44,15 +44,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)