[asterisk-commits] qwell: trunk r43257 - in /trunk: codecs/gsm/Makefile utils/Makefile

[asterisk-commits at lists.digium.com]

Author: qwell
Date: Tue Sep 19 09:16:12 2006
New Revision: 43257

URL: http://svn.digium.com/view/asterisk?rev=43257&view=rev
Log:
be a little more consistent with our variable usage

Modified:
    trunk/codecs/gsm/Makefile
    trunk/utils/Makefile

Modified: trunk/codecs/gsm/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/codecs/gsm/Makefile?rev=43257&r1=43256&r2=43257&view=diff
==============================================================================
--- trunk/codecs/gsm/Makefile (original)
+++ trunk/codecs/gsm/Makefile Tue Sep 19 09:16:12 2006
@@ -50,7 +50,7 @@
 #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 @@
 # 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 @@
 		$(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

Modified: trunk/utils/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/utils/Makefile?rev=43257&r1=43256&r2=43257&view=diff
==============================================================================
--- trunk/utils/Makefile (original)
+++ trunk/utils/Makefile Tue Sep 19 09:16:12 2006
@@ -15,7 +15,7 @@
 
 UTILS:=astman smsq stereorize streamplayer aelparse muted
 
-ifeq (${OSARCH},SunOS)
+ifeq ($(OSARCH),SunOS)
   LIBS+=-lsocket -lnsl
   UTILS:=$(filter-out muted,$(UTILS))
 endif