diff options
author | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
---|---|---|
committer | Kevin P. Fleming <kpfleming@digium.com> | 2006-08-21 02:11:39 +0000 |
commit | 0a27d8bfe5fa36d8cb600b5b520f9b5c7fbf0ed6 (patch) | |
tree | 270b9c46c1e644483d6d2a35b509f43218ba3252 /codecs/gsm | |
parent | f60ada0be22cd646454278e102d384a5dbaf7d59 (diff) |
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40722 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'codecs/gsm')
-rw-r--r-- | codecs/gsm/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile index 483875cb6..9437c9ff9 100644 --- a/codecs/gsm/Makefile +++ b/codecs/gsm/Makefile @@ -38,7 +38,7 @@ WAV49 = -DWAV49 ######### probably require gcc. ifeq (, $(findstring $(OSARCH) , Darwin SunOS )) -ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc ppc64 ia64 s390)) +ifeq (, $(findstring $(PROC) , x86_64 amd64 ultrasparc sparc64 arm ppc ppc64 ia64 s390 bfin )) ifeq (, $(findstring $(shell uname -m) , ppc ppc64 alpha armv4l s390 )) OPTIMIZE+=-march=$(PROC) endif @@ -210,7 +210,7 @@ GSM_SOURCES = $(SRC)/add.c \ # XXX should merge with GSM_OBJECTS ifeq (${OSARCH},Linux) ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 )) -ifeq (,$(findstring ${PROC} , arm ia64 s390 )) +ifeq (,$(findstring ${PROC} , arm ia64 s390 bfin )) GSM_SOURCES+= $(SRC)/k6opt.s endif endif @@ -262,7 +262,7 @@ GSM_OBJECTS = $(SRC)/add.o \ ifeq (${OSARCH},Linux) ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc )) -ifeq (,$(findstring ${PROC} , arm ia64 )) +ifeq (,$(findstring ${PROC} , arm ia64 bfin )) GSM_OBJECTS+= $(SRC)/k6opt.o endif endif |