diff options
author | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-30 14:05:02 +0000 |
---|---|---|
committer | root <root@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-04-30 14:05:02 +0000 |
commit | c44250740df0614a56e5a92eceeabe17684787cc (patch) | |
tree | 9749ac18bdd0f5332d7c9b445553284a78b4719a | |
parent | 2e10d45b8d2176086f47d5a8d4f9ac0888c79e41 (diff) |
automerge commit
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@23668 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | Makefile | 5 | ||||
-rw-r--r-- | apps/Makefile | 5 |
2 files changed, 3 insertions, 7 deletions
@@ -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 ca7f86e7b..b1bdae2f6 100644 --- 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 |