From 99cf427def5b0871a49bc3ad80e7811281876cae Mon Sep 17 00:00:00 2001 From: Automerge script Date: Tue, 30 May 2006 17:05:14 +0000 Subject: [PATCH] automerge commit git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@30834 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- codecs/gsm/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 965aea187a..8bc53e88d5 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 \ -- 2.47.2