[Asterisk-cvs] asterisk ChangeLog,1.41,1.42 Makefile,1.219,1.220

[kpfleming]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv13240

Modified Files:
	ChangeLog Makefile 
Log Message:
dont-optimize was broken...


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- ChangeLog	7 Nov 2005 22:05:31 -0000	1.41
+++ ChangeLog	7 Nov 2005 22:33:12 -0000	1.42
@@ -1,5 +1,7 @@
 2005-11-07  Kevin P. Fleming  <kpfleming at 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)

Index: Makefile
===================================================================
RCS file: /usr/cvsroot/asterisk/Makefile,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -d -r1.219 -r1.220
--- Makefile	5 Nov 2005 18:58:27 -0000	1.219
+++ Makefile	7 Nov 2005 22:33:12 -0000	1.220
@@ -36,17 +36,19 @@
 # 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 @@
 		$(INSTALL) -m 755 init.asterisk /etc/init.d/asterisk; \
 	fi 
 
-dont-optimize:
-	$(MAKE) OPTIMIZE= K6OPT= install
+dont-optimize: install
 
 valgrind: dont-optimize