[asterisk-commits] branch 1.2 r23673 - in /branches/1.2: ./ cdr/ channels/ db1-ast/ editline/

[asterisk-commits at lists.digium.com]

Author: kpfleming
Date: Sun Apr 30 09:27:56 2006
New Revision: 23673

URL: http://svn.digium.com/view/asterisk?rev=23673&view=rev
Log:
allow top-level OPTIMIZE setting to affect builds in these subdirectories too

Modified:
    branches/1.2/Makefile
    branches/1.2/cdr/Makefile
    branches/1.2/channels/Makefile
    branches/1.2/db1-ast/Makefile
    branches/1.2/editline/configure

Modified: branches/1.2/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/Makefile?rev=23673&r1=23672&r2=23673&view=diff
==============================================================================
--- branches/1.2/Makefile (original)
+++ branches/1.2/Makefile Sun Apr 30 09:27:56 2006
@@ -433,10 +433,10 @@
 noclean: depend asterisk subdirs
 
 editline/config.h:
-	cd editline && unset CFLAGS LIBS && ./configure ; \
+	cd editline && unset CFLAGS LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
 
 editline/libedit.a: FORCE
-	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: FORCE

Modified: branches/1.2/cdr/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/cdr/Makefile?rev=23673&r1=23672&r2=23673&view=diff
==============================================================================
--- branches/1.2/cdr/Makefile (original)
+++ branches/1.2/cdr/Makefile Sun Apr 30 09:27:56 2006
@@ -32,7 +32,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
 
 #

Modified: branches/1.2/channels/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/channels/Makefile?rev=23673&r1=23672&r2=23673&view=diff
==============================================================================
--- branches/1.2/channels/Makefile (original)
+++ branches/1.2/channels/Makefile Sun Apr 30 09:27:56 2006
@@ -44,7 +44,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: branches/1.2/db1-ast/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.2/db1-ast/Makefile?rev=23673&r1=23672&r2=23673&view=diff
==============================================================================
--- branches/1.2/db1-ast/Makefile (original)
+++ branches/1.2/db1-ast/Makefile Sun Apr 30 09:27:56 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
 
 LIBDBSO=libdb.so.$(SOVER)

Modified: branches/1.2/editline/configure
URL: http://svn.digium.com/view/asterisk/branches/1.2/editline/configure?rev=23673&r1=23672&r2=23673&view=diff
==============================================================================
--- branches/1.2/editline/configure (original)
+++ branches/1.2/editline/configure Sun Apr 30 09:27:56 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