From f463fdbdf09b4bf9f166d72a4e0c77246c07096d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Tue, 26 Apr 2005 18:43:34 +0000 Subject: [PATCH] defs.mk: Handle optimisation and debug options globally in defs.mk --- make/defs.mk | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/make/defs.mk b/make/defs.mk index ba312808..702d5616 100644 --- a/make/defs.mk +++ b/make/defs.mk @@ -133,19 +133,12 @@ MEMBERS = $(LIB_A)($(OBJ)) #YAMD = yamd- #EFENCE = -lefence #CFLAGS += -DNDEBUG -O2 -g $(INCLUDE) $(LOCAL_CFLAGS) #production -CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) -CPPFLAGS_DEBUG = $(CFLAGS_DEBUG) CFLAGS += $(LOCAL_CFLAGS) $(PROJECT_CFLAGS) $(YLIB_CFLAGS) $(INCLUDE) CPPFLAGS += $(LOCAL_CPPFLAGS) $(PROJECT_CPPFLAGS) $(YLIB_CPPFLAGS) $(INCLUDE) LDFFTW = -lrfftw -lfftw -lm #LDAUDIO = -laudiofile CORE = $(wildcard core core.*) -ifeq ($(DEVELOPMENT),true) -CFLAGS += $(CFLAGS_DEBUG) -CPPFLAGS += $(CPPFLAGS_DEBUG) -endif - LIBDIR = $(TOPDIR)/lib INSTALLED_SHOBJS = $(addprefix $(INSTALL_LIBDIR)/,$(SHOBJS)) @@ -293,21 +286,25 @@ ifeq ($(USE_TRACING),true) endif ifeq ($(USE_COMPILER_DEBUG_OPTS),true) - PROJECT_CFLAGS += -Wall -g3 - PROJECT_CPPFLAGS += -Wall -g3 - PROJECT_LDFLAGS += -Wall -g3 + + CFLAGS_DEBUG = -Wall -D_DEBUG_ -g3 $(MEMWATCH) + CPPFLAGS_DEBUG = $(CFLAGS_DEBUG) + LDFLAGS_DEBUG = -Wall -g3 + + PROJECT_CFLAGS += $(CFLAGS_DEBUG) + PROJECT_CPPFLAGS += $(CFLAGS_DEBUG) + PROJECT_LDFLAGS += $(LDFLAGS_DEBUG) +else + PROJECT_CFLAGS += -DNDEBUG + PROJECT_CPPFLAGS += -DNDEBUG endif ifeq ($(USE_COMPILER_OPTIMIZATION_OPTS),true) PROJECT_CFLAGS += -funroll-loops -O2 PROJECT_CPPFLAGS += -funroll-loops -O2 -else - ifneq ($(USE_COMPILER_DEBUG_OPTS),true) - PROJECT_CFLAGS += -DNDEBUG - PROJECT_CPPFLAGS += -DNDEBUG - endif endif + ifneq ($(wildcard $(TOPDIR)/make/local.mk),) include $(TOPDIR)/make/local.mk endif