aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-06 00:25:23 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-06-06 00:25:23 +0000
commit5998dbac5c395d3351c4656b7a759c69402c830d (patch)
tree98e33e8c86ed09ad4010914ec5069746f49ce243 /Makefile
parentbb0b421ea8c2b40c0ab6be495e9de46f1852b6cf (diff)
add the ability to do the same thing as "make dont-optimize" by enabling the
option in menuselect. This is very useful for developers if you want to ensure that all of your builds are done without optimizations. git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32434 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile39
1 files changed, 23 insertions, 16 deletions
diff --git a/Makefile b/Makefile
index 4c0d6d6fe..92e1a2a17 100644
--- a/Makefile
+++ b/Makefile
@@ -37,22 +37,6 @@ PWD=$(shell pwd)
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions. This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT = -DK6OPT
-
-# 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
-
# Overwite config files on "make samples"
OVERWRITE=y
@@ -147,6 +131,29 @@ TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
+ ifeq ($(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,
+# ppro's, etc, as well as the AMD K6 and K7.
+#K6OPT = -DK6OPT
+
+# 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)
+ CFLAGS+=-DSTACK_BACKTRACES
+ endif
+endif
+
# *CLI> show memory allocations [filename]
# *CLI> show memory summary [filename]
ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)