aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-30 17:05:14 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-30 17:05:14 +0000
commit6146d094f54a3bf38d31de91365cdce8ef0a3587 (patch)
treef00c4029039d649db1ce3f6d30c40c24a699573a
parent70dd654ee8ee6a9a57ffa5db5d97fd972163c8f7 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@30834 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--codecs/gsm/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 965aea187..8bc53e88d 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -242,6 +242,7 @@ ifneq ($(shell uname -m),armv4l)
ifneq ($(shell uname -m),sparc64)
ifneq (${PROC},arm)
ifneq ($(shell uname -m), parisc)
+ifneq ($(shell uname -m), s390)
GSM_SOURCES+= $(SRC)/k6opt.s
endif
endif
@@ -253,6 +254,7 @@ endif
endif
endif
endif
+endif
TOAST_SOURCES = $(SRC)/toast.c \
$(SRC)/toast_lin.c \