diff options
| author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-30 14:27:56 +0000 |
|---|---|---|
| committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-30 14:27:56 +0000 |
| commit | d4edd03ff9e7a37a73e12890c2b4881719989441 (patch) | |
| tree | 8b9c7a7e7a426edbbb861deace48e69441a7ee10 | |
| parent | c14fd145b7cdbcb88d91b52f567bb0faabc86162 (diff) | |
allow top-level OPTIMIZE setting to affect builds in these subdirectories too
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2@23673 f38db490-d61c-443f-a65b-d21fe96a405b
| -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
@@ -433,10 +433,10 @@ endif 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 diff --git a/cdr/Makefile b/cdr/Makefile index 3cd83f492..bca0165c5 100644 --- a/cdr/Makefile +++ b/cdr/Makefile @@ -32,7 +32,7 @@ endif #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 # diff --git a/channels/Makefile b/channels/Makefile index 704ed505c..d56c6bfcb 100644 --- a/channels/Makefile +++ b/channels/Makefile @@ -44,7 +44,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 0aa9fdb02..87ced1a48 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 LIBDBSO=libdb.so.$(SOVER) 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 |