From dbfa007d8aa2e26cd1f07e82febfd89dda3d57ef Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Thu, 22 Jun 2006 13:22:07 +0000 Subject: clean up a little mess I created by using the 'or' function instead of gross nested if statements git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@35459 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3028e5b14..1a81adb77 100644 --- a/Makefile +++ b/Makefile @@ -133,8 +133,7 @@ TOPDIR_CFLAGS=-Iinclude MOD_SUBDIR_CFLAGS=-I../include -I.. OTHER_SUBDIR_CFLAGS=-I../include -I.. -ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),) - ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),) +ifeq ($(or $(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS))),) # More GSM codec optimization # Uncomment to enable MMXTM optimizations for x86 architecture CPU's # which support MMX instructions. This should be newer pentiums, @@ -143,12 +142,6 @@ ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),) # Tell gcc to optimize the code OPTIMIZE+=-O6 - else - # Stack backtraces, while useful for debugging, are incompatible with optimizations - ifeq ($(OSARCH),Linux) - CFLAGS+=-DSTACK_BACKTRACES - endif - endif else # Stack backtraces, while useful for debugging, are incompatible with optimizations ifeq ($(OSARCH),Linux) -- cgit v1.2.3