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

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23674 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/Makefile b/Makefile
index 6c047d69df0cdb347a1083fe4cb958baa5b0703e..8c9e7730286731502b795172a8fb613da6c79755 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -464,10 +464,10 @@ all: TAGS
 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:

diff --git a/cdr/Makefile b/cdr/Makefile
index 137598011f0366bab03541154e4c48ca88e9fb8e..ccce4d4844c01b64768e67ec161e982383342fa1 100644 (file)
--- a/cdr/Makefile
+++ b/cdr/Makefile
@@ -20,7 +20,7 @@ MODS:=$(filter-out $(MENUSELECT_CDR),$(patsubst %.c,%.so,$(wildcard cdr_*.c)))
 #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),)

diff --git a/channels/Makefile b/channels/Makefile
index e5fe3c062dc1aa4e841d5a3631ac8170cba699d6..aca979f52feca1b83628bf2f4b072a0f0d7413c1 100644 (file)
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -26,7 +26,7 @@ endif
 
 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)

diff --git a/db1-ast/Makefile b/db1-ast/Makefile
index 3d218c25acad14f76855d6b8b92774309472fa61..88273a0a978bd3f589a26e0b040d8ecd71ea4d47 100644 (file)
--- a/db1-ast/Makefile
+++ b/db1-ast/Makefile
@@ -10,7 +10,7 @@ endif
 #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)

diff --git a/editline/configure b/editline/configure
index 7265fe0200464bf2225c4ba58b5f780d1b19d48f..8f9075c5f9503cce72e516185c95b97f456f202a 100755 (executable)
--- a/editline/configure
+++ b/editline/configure
@@ -1923,8 +1923,6 @@ fi
 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