[asterisk-commits] trunk r23674 - in /trunk: ./ cdr/ channels/ db1-ast/ editline/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sun Apr 30 09:28:25 2006
New Revision: 23674

URL: http://svn.digium.com/view/asterisk?rev=23674&view=rev
Log:
Merged revisions 23673 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r23673 | kpfleming | 2006-04-30 09:27:56 -0500 (Sun, 30 Apr 2006) | 2 lines

allow top-level OPTIMIZE setting to affect builds in these subdirectories too

........

Modified:
    trunk/   (props changed)
    trunk/Makefile
    trunk/cdr/Makefile
    trunk/channels/Makefile
    trunk/db1-ast/Makefile
    trunk/editline/configure

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=23674&r1=23673&r2=23674&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Apr 30 09:28:25 2006
@@ -464,10 +464,10 @@
 endif
 
 editline/config.h:
-	cd editline && unset CFLAGS LIBS && ./configure ; \
+	cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
 
 editline/libedit.a:
-	cd editline && unset CFLAGS LIBS && test -f config.h || ./configure
+	cd editline && unset CFLAGS LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
 	$(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a:

Modified: trunk/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/cdr/Makefile?rev=23674&r1=23673&r2=23674&view=diff
==============================================================================
--- trunk/cdr/Makefile (original)
+++ trunk/cdr/Makefile Sun Apr 30 09:28:25 2006
@@ -20,7 +20,7 @@
 #the default as we now have a better instruction set to work with. - Belgarath
 ifeq ($(PROC),sparc64)
   PROC=ultrasparc
-  CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+  CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
 ifneq ($(TDS_LIB),)

Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?rev=23674&r1=23673&r2=23674&view=diff
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Sun Apr 30 09:28:25 2006
@@ -26,7 +26,7 @@
 
 ifeq ($(PROC),sparc64)
   PROC=ultrasparc
-  CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+  CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
 ifeq ($(OSARCH),FreeBSD)

Modified: trunk/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/db1-ast/Makefile?rev=23674&r1=23673&r2=23674&view=diff
==============================================================================
--- trunk/db1-ast/Makefile (original)
+++ trunk/db1-ast/Makefile Sun Apr 30 09:28:25 2006
@@ -10,7 +10,7 @@
 #Added support for UltraSparc - Belgarath
 ifeq ($(ARCH),sparc64)
 PROC=ultrasparc
-CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8
+CFLAGS += -mtune=$(PROC) -pipe -fomit-frame-pointer -mcpu=v8
 endif
 
 ifeq ($(OSARCH),Darwin)

Modified: trunk/editline/configure
URL: http://svn.digium.com/view/asterisk/trunk/editline/configure?rev=23674&r1=23673&r2=23674&view=diff
==============================================================================
--- trunk/editline/configure (original)
+++ trunk/editline/configure Sun Apr 30 09:28:25 2006
@@ -1923,8 +1923,6 @@
 if test "x$enable_debug" = "xyes" ; then
   CPPFLAGS="$CPPFLAGS -DDEBUG_TTY -DDEBUG_KEY -DDEBUG_READ -DDEBUG"
   CPPFLAGS="$CPPFLAGS -DDEBUG_REFRESH -DDEBUG_PASTE"
-else
-  CFLAGS="$CFLAGS -O"
 fi