automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-02-24 00:04:40 +00:00
parent 74879cff5b
commit 2dc3679b6e

View File

@@ -36,6 +36,8 @@ endif
# Remember the MAKELEVEL at the top
MAKETOPLEVEL?=$(MAKELEVEL)
PWD=$(shell pwd)
ifneq ($(findstring dont-optimize,$(MAKECMDGOALS)),dont-optimize)
######### More GSM codec optimization
######### Uncomment to enable MMXTM optimizations for x86 architecture CPU's
@@ -212,7 +214,6 @@ ifeq ($(OSARCH),Linux)
MPG123TARG=linux
endif
PWD=$(shell pwd)
GREP=grep
ifeq ($(OSARCH),SunOS)