kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor cleanup and reorganization (issue #5073)

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6468 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-08-31 03:32:15 +00:00
parent 561ab01345
commit 22dc4f71fe
1 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Makefile
View File

@@ -283,20 +283,32 @@ CFLAGS+= $(OPTIONS)
CFLAGS+= -fomit-frame-pointer CFLAGS+= -fomit-frame-pointer
SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime SUBDIRS=res channels pbx apps codecs formats agi cdr funcs utils stdtime
ifeq (${OSARCH},Linux) OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
LIBS=-ldl -lpthread translate.o file.o say.o pbx.o cli.o md5.o term.o \
endif ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o
ifeq (${OSARCH},Linux)
LIBS=-ldl -lpthread -lncurses -lm -lresolv #-lnjamd
else
LIBS+=-lncurses -lm LIBS+=-lncurses -lm
ifeq (${OSARCH},Linux)
LIBS+=-lresolv #-lnjamd
endif endif
ifeq (${OSARCH},Darwin) ifeq (${OSARCH},Darwin)
LIBS+=-lresolv LIBS+=-lresolv
CFLAGS+=-D__Darwin__ CFLAGS+=-D__Darwin__
AUDIO_LIBS=-framework CoreAudio AUDIO_LIBS=-framework CoreAudio
OBJS+=poll.o dlfcn.o
ASTLINK=-Wl,-dynamic
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
else
#These are used for all but Darwin
ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
endif endif
ifeq (${OSARCH},FreeBSD) ifeq (${OSARCH},FreeBSD)
@@ -313,34 +325,13 @@ 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)/usr/local/ssl/lib
endif
LIBS+=-lssl
OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
translate.o file.o say.o pbx.o cli.o md5.o term.o \
ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
cdr.o tdd.o acl.o rtp.o manager.o asterisk.o \
dsp.o chanvars.o indications.o autoservice.o db.o privacy.o \
astmm.o enum.o srv.o dns.o aescrypt.o aestab.o aeskey.o \
utils.o plc.o jitterbuf.o dnsmgr.o devicestate.o \
netsock.o slinfactory.o ast_expr2.o ast_expr2f.o
ifeq (${OSARCH},Darwin)
OBJS+=poll.o dlfcn.o
ASTLINK=-Wl,-dynamic
SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
else
ASTLINK=-Wl,-E
SOLINK=-shared -Xlinker -x
endif
ifeq (${OSARCH},SunOS)
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)/usr/local/ssl/lib
endif endif
LIBS+=-lssl
INSTALL=install INSTALL=install
_all: all _all: all
@@ -883,3 +874,4 @@ unapply:
else \ else \
echo "No such patch $(PATCH) in patches directory"; \ echo "No such patch $(PATCH) in patches directory"; \
fi fi