aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-12 18:05:51 +0000
committerroot <root@f38db490-d61c-443f-a65b-d21fe96a405b>2006-03-12 18:05:51 +0000
commita1e84657e3c8ac23cd1fc00e4fd83d8c4680df20 (patch)
treed7a4b9be73d390ce6e3440de8cdd2458c85c7121 /codecs
parentffe54a30e43921c53f80978270fb038cb2098352 (diff)
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@12609 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/gsm/Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index d6eb94bb8..5fb815c50 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -236,6 +236,7 @@ ifneq ($(shell uname -m),alpha)
ifneq ($(shell uname -m),armv4l)
ifneq ($(shell uname -m),sparc64)
ifneq (${PROC},arm)
+ifneq ($(shell uname -m), parisc)
GSM_SOURCES+= $(SRC)/k6opt.s
endif
endif
@@ -245,6 +246,7 @@ endif
endif
endif
endif
+endif
TOAST_SOURCES = $(SRC)/toast.c \
$(SRC)/toast_lin.c \
@@ -297,6 +299,7 @@ ifneq ($(shell uname -m), ppc64)
ifneq ($(shell uname -m), alpha)
ifneq ($(shell uname -m), sparc64)
ifneq ($(shell uname -m), armv4l)
+ifneq ($(shell uname -m), parisc)
GSM_OBJECTS+= $(SRC)/k6opt.o
endif
endif
@@ -305,6 +308,7 @@ endif
endif
endif
endif
+endif
TOAST_OBJECTS = $(SRC)/toast.o \
$(SRC)/toast_lin.o \