From 50b39c939345c36eb5e95c8a71ccdb8cd24c9aad Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Mon, 9 Jan 2017 16:11:04 +0100
Subject: Be consistent in use of DEBUG/NDEBUG macros.

Only use NDEBUG as it's the one that most environments already set, so
is likely to lead to the least amount of confusion if compiling with a
custom build system.
---
 Makerules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'Makerules')

diff --git a/Makerules b/Makerules
index 8a17d779..fa98685a 100644
--- a/Makerules
+++ b/Makerules
@@ -22,7 +22,7 @@ LDREMOVEUNREACH = -Wl,--gc-sections
 endif
 
 ifeq "$(build)" "debug"
-CFLAGS += -pipe -g -DDEBUG
+CFLAGS += -pipe -g
 LDFLAGS += -g
 else ifeq "$(build)" "release"
 CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
@@ -31,19 +31,19 @@ else ifeq "$(build)" "small"
 CFLAGS += -pipe -Os -DNDEBUG -fomit-frame-pointer
 LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
 else ifeq "$(build)" "sanitize"
-CFLAGS += -pipe -g -DDEBUG -fsanitize=address -fno-omit-frame-pointer
+CFLAGS += -pipe -g -fsanitize=address -fno-omit-frame-pointer
 LDFLAGS += -fsanitize=address
 else ifeq "$(build)" "profile"
 CFLAGS += -pipe -O2 -DNDEBUG -pg
 LDFLAGS += -pg
 else ifeq "$(build)" "coverage"
-CFLAGS += -pipe -g -DDEBUG -pg -fprofile-arcs -ftest-coverage
+CFLAGS += -pipe -g -pg -fprofile-arcs -ftest-coverage
 LIBS += -lgcov
 else ifeq "$(build)" "native"
 CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer -march=native -mfpmath=sse
 LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
 else ifeq "$(build)" "memento"
-CFLAGS += -pipe -g -DMEMENTO -DDEBUG
+CFLAGS += -pipe -g -DMEMENTO
 LDFLAGS += -g -d -rdynamic
 ifeq "$(HAVE_LIBDL)" "yes"
 CFLAGS += -DHAVE_LIBDL
-- 
cgit v1.2.3