Makefile: fixup Mac dependencies

Now, Mac OSX builds can just use "make", not "make mac". (This also allows
"make debug" for Mac OSX)

diff --git a/Makefile b/Makefile
index 2acdbc7dff8a7738c6f99349421aa66bc97b5d5b..91acd7e8738d5a626ac90e058494ad24066bdfba 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,10 +6,17 @@ OBJECTS = libthreads.o schedule.o model.o threads.o librace.o action.o \
          snapshot.o malloc.o mymemory.o
 
 CPPFLAGS += -Iinclude -I.
          snapshot.o malloc.o mymemory.o
 
 CPPFLAGS += -Iinclude -I.

-LDFLAGS=-ldl -lrt
-SHARED=-shared
+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)
 
 program_H_SRCS := $(wildcard *.h) $(wildcard include/*.h)
 program_C_SRCS := $(wildcard *.c) $(wildcard *.cc)


@@ -18,18 +25,13 @@ DEPS = make.deps
 all: $(LIB_SO) $(DEPS) tests
 
 $(DEPS): $(program_C_SRCS) $(program_H_SRCS)
 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
 
 
 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
-

 docs: *.c *.cc *.h
        doxygen
 
 docs: *.c *.cc *.h
        doxygen
 


@@ -44,7 +46,7 @@ malloc.o: malloc.c
 
 clean:
        rm -f *.o *.so
 
 clean:
        rm -f *.o *.so

-       $(MAKE) -C $(TESTS) clean
+       $(MAKE) -C $(TESTS_DIR) clean

 
 mrclean: clean
        rm -rf docs
 
 mrclean: clean
        rm -rf docs


@@ -53,4 +55,4 @@ tags::
        ctags -R
 
 tests:: $(LIB_SO)
        ctags -R
 
 tests:: $(LIB_SO)

-       $(MAKE) -C $(TESTS)
+       $(MAKE) -C $(TESTS_DIR)

diff --git a/common.mk b/common.mk
index 378a6597a1e422243689cd46312c25acfdd26d01..e9e406002296c48e8e324f6cf440875487ff6a47 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,9 +1,11 @@
 # A few common Makefile items
 
 # A few common Makefile items
 

-CC=gcc
-CXX=g++
+CC = gcc
+CXX = g++

 
 

-LIB_NAME=model
-LIB_SO=lib$(LIB_NAME).so
+UNAME = $(shell uname)

 
 

-CPPFLAGS=-Wall -g -O0
+LIB_NAME = model
+LIB_SO = lib$(LIB_NAME).so
+
+CPPFLAGS += -Wall -g -O0