diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-22 13:22:07 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-22 13:22:07 +0000 |
| commit | 55abc954ce19867dd11438541f8647597d14bcd4 (patch) | |
| tree | edbf6679fbdd168030530e21e9d52e6d4a504c04 | |
| parent | 3889dd878be90598309d5dbdbc0a8c02ebde3c16 (diff) | |
clean up a little mess I created by using the 'or' function instead of gross
nested if statements
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@35459 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | Makefile | 9 |
1 files changed, 1 insertions, 8 deletions
@@ -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) |