kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 10:28:32 +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@36297 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-06-29 20:01:30 +00:00
parent 402cef20d8
commit 603eaab120
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Makefile
View File

@@ -28,6 +28,7 @@ HOST_CC=gcc
ifeq ($(CROSS_COMPILE),) ifeq ($(CROSS_COMPILE),)
OSARCH=$(shell uname -s) OSARCH=$(shell uname -s)
OSREV=$(shell uname -r) OSREV=$(shell uname -r)
OSCPU=$(shell uname -m)
else else
OSARCH=$(CROSS_ARCH) OSARCH=$(CROSS_ARCH)
OSREV=$(CROSS_REV) OSREV=$(CROSS_REV)
@@ -83,6 +84,8 @@ TRACE_FRAMES = #-DTRACE_FRAMES
# #
MALLOC_DEBUG = #-include $(PWD)/include/asterisk/astmm.h MALLOC_DEBUG = #-include $(PWD)/include/asterisk/astmm.h
INSTALL=install
# Where to install asterisk after compiling # Where to install asterisk after compiling
# Default -> leave empty # Default -> leave empty
INSTALL_PREFIX?= INSTALL_PREFIX?=
@@ -214,12 +217,15 @@ ifeq ($(OSARCH),Linux)
endif endif
GREP=grep GREP=grep
LN=ln
ID=id ID=id
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
GREP=/usr/xpg4/bin/grep GREP=/usr/xpg4/bin/grep
M4=/usr/local/bin/m4 M4=/usr/local/bin/m4
ID=/usr/xpg4/bin/id ID=/usr/xpg4/bin/id
LN=/usr/xpg4/bin/ln
INSTALL=ginstall
endif endif
INCLUDE+=-Iinclude -I../include INCLUDE+=-Iinclude -I../include
@@ -286,7 +292,10 @@ endif
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
ASTCFLAGS+=-Wcast-align -DSOLARIS ASTCFLAGS+=-Wcast-align -DSOLARIS
INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include INCLUDE+=-Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
ifeq ($(OSCPU),sun4u)
OPTIMIZE+=-mcpu=v9 -mcpu=ultrasparc
endif
endif endif
ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN) ifeq ($(findstring CYGWIN,$(OSARCH)),CYGWIN)
@@ -364,7 +373,11 @@ endif
ifeq ($(OSARCH),Linux) ifeq ($(OSARCH),Linux)
LIBS+=-ldl -lpthread -lncurses -lm -lresolv #-lnjamd LIBS+=-ldl -lpthread -lncurses -lm -lresolv #-lnjamd
else else
LIBS+=-lncurses -lm ifeq ($(OSARCH),SunOS)
LIBS+=-lm -lcurses
else
LIBS+=-lncurses -lm
endif
endif endif
ifeq ($(OSARCH),Darwin) ifeq ($(OSARCH),Darwin)
@@ -394,10 +407,10 @@ ifeq ($(OSARCH),OpenBSD)
endif endif
ifeq ($(OSARCH),SunOS) ifeq ($(OSARCH),SunOS)
LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
OBJS+=strcompat.o OBJS+=strcompat.o
ASTLINK= ASTLINK=
SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
endif endif
ifeq ($(MAKETOPLEVEL),$(MAKELEVEL)) ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
@@ -413,8 +426,6 @@ endif
LIBS+=-lssl LIBS+=-lssl
INSTALL=install
_all: all _all: all
@echo " +--------- Asterisk Build Complete ---------+" @echo " +--------- Asterisk Build Complete ---------+"
@echo " + Asterisk has successfully been built, but +" @echo " + Asterisk has successfully been built, but +"
@@ -638,7 +649,7 @@ bininstall: all
if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
ln -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk $(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
$(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/ $(INSTALL) -m 755 contrib/scripts/astgenkey $(DESTDIR)$(ASTSBINDIR)/
$(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/ $(INSTALL) -m 755 contrib/scripts/autosupport $(DESTDIR)$(ASTSBINDIR)/
if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \ if [ ! -f $(DESTDIR)$(ASTSBINDIR)/safe_asterisk ]; then \