aboutsummaryrefslogtreecommitdiffstats
path: root/codecs
diff options
context:
space:
mode:
authorqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-19 14:16:12 +0000
committerqwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-19 14:16:12 +0000
commitd275c13edc5e487e0d6878a1574ed3a1cb9d76df (patch)
tree1d982f558e75d73ac3bb505545fbbeea34bd6072 /codecs
parente3f9e0540a73af53f039228ce4360a4b13d7caa4 (diff)
be a little more consistent with our variable usage
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@43257 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r--codecs/gsm/Makefile10
1 files changed, 5 insertions, 5 deletions
diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index 05ee95b48..036bb530a 100644
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -50,7 +50,7 @@ endif
#A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn't support it.
#So we go lowest common available by gcc and go a step down, still a step up from
#the default as we now have a better instruction set to work with. - Belgarath
-ifeq (${PROC},ultrasparc)
+ifeq ($(PROC),ultrasparc)
OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3
endif
@@ -208,9 +208,9 @@ GSM_SOURCES = $(SRC)/add.c \
# add k6-specific code only if not on a non-k6 hardware or proc.
# XXX Keep a space after each findstring argument
# XXX should merge with GSM_OBJECTS
-ifeq (${OSARCH},Linux)
+ifeq ($(OSARCH),linux-gnu)
ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc s390 ))
-ifeq (,$(findstring ${PROC} , arm ia64 s390 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 s390 bfin ))
GSM_SOURCES+= $(SRC)/k6opt.s
endif
endif
@@ -260,9 +260,9 @@ GSM_OBJECTS = $(SRC)/add.o \
$(SRC)/short_term.o \
$(SRC)/table.o
-ifeq (${OSARCH},Linux)
+ifeq ($(OSARCH),linux-gnu)
ifeq (,$(findstring $(shell uname -m) , x86_64 amd64 ppc ppc64 alpha armv4l sparc64 parisc ))
-ifeq (,$(findstring ${PROC} , arm ia64 bfin ))
+ifeq (,$(findstring $(PROC) , arm ia64 bfin ))
GSM_OBJECTS+= $(SRC)/k6opt.o
endif
endif