diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-30 14:28:25 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-04-30 14:28:25 +0000 |
| commit | d7aead737dfb89adb6052824e1d96ddef89bd0e1 (patch) | |
| tree | 660c91040f24ba18f8a4a294037e873256421a78 | |
| parent | 367f227d896810248550ac17459ecfbd074eb507 (diff) | |
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
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | cdr/Makefile | 2 | ||||
| -rw-r--r-- | channels/Makefile | 2 | ||||
| -rw-r--r-- | db1-ast/Makefile | 2 | ||||
| -rwxr-xr-x | editline/configure | 2 |
5 files changed, 5 insertions, 7 deletions
@@ -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 137598011..ccce4d484 100644 --- 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 e5fe3c062..aca979f52 100644 --- 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 3d218c25a..88273a0a9 100644 --- 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 7265fe020..8f9075c5f 100755 --- 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 |