common: add print_trace() for backtracing

[c11tester.git] / Makefile

diff --git a/Makefile b/Makefile
index 67b6e6dfa5212438321639f5e4ef11bc8e2768e5..f6a0837eea4e38f076da313859eeedff14eaf6d9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,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 \
-         snapshot.o malloc.o mymemory.o
+         snapshot.o malloc.o mymemory.o common.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)
+CPPFLAGS += -D_XOPEN_SOURCE -DMAC
+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 +25,16 @@ 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)
 
+# Only include, rebuild make.deps when it's going to be used
+ifeq ($(MAKECMDGOALS),$(DEPS))
 include $(DEPS)
+endif
 
 debug: CPPFLAGS += -DCONFIG_DEBUG
 debug: all
 
-mac: CPPFLAGS += -D_XOPEN_SOURCE -DMAC -DCONFIG_DEBUG
-mac: LDFLAGS=-ldl
-mac: SHARED=-Wl,-undefined,dynamic_lookup -dynamiclib
-mac: all
-
 docs: *.c *.cc *.h
        doxygen
 
@@ -44,7 +49,7 @@ malloc.o: malloc.c
 
 clean:
        rm -f *.o *.so
-       $(MAKE) -C $(TESTS) clean
+       $(MAKE) -C $(TESTS_DIR) clean
 
 mrclean: clean
        rm -rf docs
@@ -53,4 +58,4 @@ tags::
        ctags -R
 
 tests:: $(LIB_SO)
-       $(MAKE) -C $(TESTS)
+       $(MAKE) -C $(TESTS_DIR)