kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-28 15:11:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

automerge commit

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@23668 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-04-30 14:05:02 +00:00
parent ac5119e455
commit a8798960dd
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -184,7 +184,6 @@ ifeq ($(OSARCH),Linux)
# You must have GCC 3.4 to use k8, otherwise use athlon # You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8 PROC=k8
#PROC=athlon #PROC=athlon
OPTIONS+=-m64
endif endif
ifeq ($(PROC),sparc64) ifeq ($(PROC),sparc64)
@@ -205,9 +204,9 @@ ifeq ($(OSARCH),Linux)
OPTIONS+=-fsigned-char -mcpu=ep9312 OPTIONS+=-fsigned-char -mcpu=ep9312
else else
ifeq ($(SUB_PROC),xscale) ifeq ($(SUB_PROC),xscale)
OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale OPTIONS+=-fsigned-char -mcpu=xscale
else else
OPTIONS+=-fsigned-char -msoft-float OPTIONS+=-fsigned-char
endif endif
endif endif
endif endif

5
apps/Makefile
View File

@@ -86,7 +86,7 @@ endif
all: $(APPS) all: $(APPS)
clean: clean:
rm -f *.so *.o look .depend rm -f *.so *.o .depend
%.so : %.o %.so : %.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(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 app_sql_odbc.so: app_sql_odbc.o
$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
look: look.c
$(CC) -pipe -O6 -g look.c -o look -lncurses
ifeq (SunOS,$(shell uname)) ifeq (SunOS,$(shell uname))
app_chanspy.so: app_chanspy.o app_chanspy.so: app_chanspy.o
$(CC) $(SOLINK) -o $@ $< -lrt $(CC) $(SOLINK) -o $@ $< -lrt