makfiles

diff --git a/Makefile b/Makefile
index 44eac28013c0d31e8d358faa634a54a94e5a45c9..33aa85fad85d5c6f182d3f5f1b7214f092e043b4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@ run-test-more: mess-run-test-more $(TESTS)
 love:
        @echo " ...not war."
 debug:
-       $(MAKE) $(MAKECMDGOALS) PREFIX=$(PREFIX) NAME=$(NAME) DEBUG=1
+       $(MAKE) build PREFIX=$(PREFIX) NAME=$(NAME) DEBUG=1
 
 # Clean
 clean: mess-clean doc man $(TESTS) $(NAMES)

diff --git a/src/tdef/makefile.d b/src/tdef/makefile.d
index c093aa212aad8643e442f7787152725d10f4e40a..38195c6e0f4fb05be8ffe5fab9d0c3f3d6fa47a1 100755 (executable)
--- a/src/tdef/makefile.d
+++ b/src/tdef/makefile.d
@@ -22,6 +22,7 @@ PREFIX    =  /usr/local
 
 # Required libraries if any:
 # LDFLAGS += -lcheck $(shell pkg-config --libs --clfags check)
+LDFLAGS += -lm
 
 # Required *locally compiled* libraries if any:
 # LIBS     = cutils
@@ -34,8 +35,12 @@ dstdir = $(srcdir)/bin
 endif
 
 ifdef DEBUG
-CFLAGS   += -ggdb -O0
-CXXFLAGS += -ggdb -O0
+CFLAGS   += -ggdb -O0 -DDEBUG
+CXXFLAGS += -ggdb -O0 -DDEBUG
+endif
+ifndef DEBUG
+CFLAGS   += -DNDEBUG
+CXXFLAGS += -DNDEBUG
 endif
 
 # Default target
@@ -48,7 +53,7 @@ LDFLAGS   += -L$(dstdir)
 LDFLAGS   += $(foreach lib,$(LIBS),-l$(lib))
 endif
 deps:
-       $(foreach lib,$(LIBS),$(MAKE) --no-print-directory \
+       $(foreach lib,$(LIBS),$(MAKE) DEBUG=$(DEBUG) --no-print-directory \
                        -C $(lib)/ $(lib) dstdir=$(dstdir))
 
 .PHONY: build rebuild install uninstall clean mrpropre mrpropre \