From 018e8c83953032e55f78b819e58ad4679c28d1d3 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" <kpfleming@digium.com> Date: Mon, 7 Nov 2005 22:33:12 +0000 Subject: [PATCH] dont-optimize was broken... git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6994 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- ChangeLog | 2 ++ Makefile | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a829118fae..e4da7ac794 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2005-11-07 Kevin P. Fleming <kpfleming@digium.com> + * Makefile: restore function of 'dont-optimize' + * config.c (config_text_file_load): don't generate log message when stat() fails * many files: clean up application documentation to not refer to return values, since they cannot be used in the dialplan (work done by Neil Lewis) diff --git a/Makefile b/Makefile index 3a010c0147..c4e52ccca9 100755 --- a/Makefile +++ b/Makefile @@ -36,17 +36,19 @@ endif # Remember the MAKELEVEL at the top MAKETOPLEVEL?=$(MAKELEVEL) +ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize) ######### 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 -#Overwite config files on "make samples" -OVERWRITE=y - #Tell gcc to optimize the code OPTIMIZE+=-O6 +endif + +#Overwite config files on "make samples" +OVERWRITE=y #Include debug symbols in the executables (-g) and profiling info (-pg) DEBUG=-g #-pg @@ -815,8 +817,7 @@ config: $(INSTALL) -m 755 init.asterisk /etc/init.d/asterisk; \ fi -dont-optimize: - $(MAKE) OPTIMIZE= K6OPT= install +dont-optimize: install valgrind: dont-optimize -- GitLab