automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@12609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-03-12 18:05:51 +00:00
parent ba70bebc38
commit d008cda808

View File

@@ -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 \