diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-24 18:02:36 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-07-24 18:02:36 +0000 |
commit | 209e0e25c44e4d2040c3570a2fbdd540e7f996bc (patch) | |
tree | 28c10e50e8429ad9be3de0229a5515d838522082 /codecs | |
parent | 68dd1132762766d06e8462a8cdf51f90dd0fbd2b (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38185 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/gsm/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 9058f1293..c39fb0c03 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -242,7 +242,7 @@ ifneq ($(shell uname -m),armv4l) ifneq ($(shell uname -m),sparc64) ifneq (${PROC},arm) ifneq ($(shell uname -m), parisc) -ifneq (${PROC}, s390) +ifneq ($(shell uname -m),s390) GSM_SOURCES+= $(SRC)/k6opt.s endif endif @@ -309,6 +309,7 @@ ifneq ($(shell uname -m), alpha) ifneq ($(shell uname -m), sparc64) ifneq ($(shell uname -m), armv4l) ifneq ($(shell uname -m), parisc) +ifneq ($(shell uname -m),s390) GSM_OBJECTS+= $(SRC)/k6opt.o endif endif @@ -319,6 +320,7 @@ endif endif endif endif +endif TOAST_OBJECTS = $(SRC)/toast.o \ $(SRC)/toast_lin.o \ |