automerge commit

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

diff --git a/Makefile b/Makefile
index eca2286357bdcc2aefb2ae9fafd0242e5c58a4a1..ca3b8455dc211e102d0783e15c635cd26de0e097 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -184,7 +184,6 @@ ifeq ($(OSARCH),Linux)
     # You must have GCC 3.4 to use k8, otherwise use athlon
     PROC=k8
     #PROC=athlon
-    OPTIONS+=-m64
   endif
 
   ifeq ($(PROC),sparc64)
@@ -205,9 +204,9 @@ ifeq ($(OSARCH),Linux)
       OPTIONS+=-fsigned-char -mcpu=ep9312
     else
       ifeq ($(SUB_PROC),xscale)
-        OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale
+        OPTIONS+=-fsigned-char -mcpu=xscale
       else
-        OPTIONS+=-fsigned-char -msoft-float 
+        OPTIONS+=-fsigned-char 
       endif
     endif
   endif

diff --git a/apps/Makefile b/apps/Makefile
index ca7f86e7bf6af16febfcec840648e18270c539bb..b1bdae2f6c931ab2b3ac61b3c68c5d646fad52e8 100644 (file)
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -86,7 +86,7 @@ endif
 all: $(APPS)
 
 clean:
-       rm -f *.so *.o look .depend
+       rm -f *.so *.o .depend
 
 %.so : %.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
@@ -111,9 +111,6 @@ app_sql_postgres.so: app_sql_postgres.o
 app_sql_odbc.so: app_sql_odbc.o
        $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
 
-look:  look.c
-       $(CC) -pipe -O6 -g look.c -o look -lncurses
-
 ifeq (SunOS,$(shell uname))
 app_chanspy.so: app_chanspy.o
        $(CC) $(SOLINK) -o $@ $< -lrt