From 72880f2dad5e322eae65fbd66787c26e710802e2 Mon Sep 17 00:00:00 2001 From: bjarni Date: Mon, 8 Nov 2004 21:11:52 +0000 Subject: (svn r530) Makefile: added ability to switch asserts on and off Updated makefile.config to versiontag 2 for autoupdating purposes --- Makefile | 6 +++++- makefiledir/Makefile.config_writer | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 50b85d8ab..5dd1d4675 100644 --- a/Makefile +++ b/Makefile @@ -109,7 +109,7 @@ # Makefile version tag # it checks if the version tag in makefile.config is the same and force update outdated config files -MAKEFILE_VERSION:=1 +MAKEFILE_VERSION:=2 # CONFIG_WRITER have to be found even for manual configuration CONFIG_WRITER=makefiledir/Makefile.config_writer @@ -404,6 +404,10 @@ endif endif endif +# enables/disables assert() +ifndef ENABLE_ASSERTS +CFLAGS += -DNDEBUG +endif ifdef TRANSLATOR STRGEN_FLAGS=-t diff --git a/makefiledir/Makefile.config_writer b/makefiledir/Makefile.config_writer index e2c698e99..0c3d669d3 100644 --- a/makefiledir/Makefile.config_writer +++ b/makefiledir/Makefile.config_writer @@ -27,6 +27,10 @@ $(MAKE_CONFIG): $(call CONFIG_LINE,SUPRESS_LANG_ERRORS:=$(SUPRESS_LANG_ERRORS)) $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# Enable asserts) + $(call CONFIG_LINE,ENABLE_ASSERTS:=$(ENABLE_ASSERTS)) + $(call CONFIG_LINE,) + $(call CONFIG_LINE,\# See Makefile for details on these paths) $(call CONFIG_LINE,\# Folders should not end with /) $(call CONFIG_LINE,INSTALL:=$(INSTALL)) -- cgit v1.2.3-70-g09d2