automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@30358 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/codecs/gsm/Makefile b/codecs/gsm/Makefile
index f35361ca3de693543a4e6e0ff9283264bdce0ac7..965aea187a0a88f4eb27883b93e29f591ee112e7 100644 (file)
--- a/codecs/gsm/Makefile
+++ b/codecs/gsm/Makefile
@@ -38,32 +38,33 @@ WAV49       = -DWAV49
 ######### probably require gcc. 
 
 ifneq (${OSARCH},Darwin)
-ifneq (${OSARCH},SunOS)
-ifneq (${PROC},x86_64)
-ifneq (${PROC},amd64)
-ifneq (${PROC},ultrasparc)
-ifneq ($(shell uname -m),ppc)
-ifneq ($(shell uname -m),ppc64)
-ifneq ($(shell uname -m),alpha)
-ifneq ($(shell uname -m),armv4l)
-ifneq (${PROC},sparc64)
-ifneq (${PROC},arm)
-ifneq (${PROC},ppc)
-ifneq (${PROC},ppc64)
-ifneq (${PROC},s390)
+ ifneq (${OSARCH},SunOS)
+  ifneq (${PROC},x86_64)
+   ifneq (${PROC},amd64)
+    ifneq (${PROC},ultrasparc)
+     ifneq ($(shell uname -m),ppc)
+      ifneq ($(shell uname -m),ppc64)
+       ifneq ($(shell uname -m),alpha)
+        ifneq ($(shell uname -m),armv4l)
+         ifneq (${PROC},sparc64)
+          ifneq (${PROC},arm)
+           ifneq (${PROC},ppc)
+            ifneq (${PROC},ppc64)
+             ifneq (${PROC},s390)
 OPTIMIZE+=-march=$(PROC)
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
-endif
+             endif
+            endif
+           endif
+          endif
+         endif
+        endif
+       endif
+      endif
+     endif
+    endif
+   endif
+  endif
+ endif
 endif
 
 #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.