[asterisk-commits] kpfleming: trunk r40722 - in /trunk: ./ apps/
build_tools/ cdr/ channels/ cha...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sun Aug 20 19:11:42 MST 2006
Author: kpfleming
Date: Sun Aug 20 21:11:39 2006
New Revision: 40722
URL: http://svn.digium.com/view/asterisk?rev=40722&view=rev
Log:
merge new_loader_completion branch, including (at least):
- restructured build tree and makefiles to eliminate recursion problems
- support for embedded modules
- support for static builds
- simpler cross-compilation support
- simpler module/loader interface (no exported symbols)
Added:
trunk/build_tools/embed_modules.xml
- copied unchanged from r40721, team/group/new_loader_completion/build_tools/embed_modules.xml
trunk/doc/asterisk.8
- copied unchanged from r40721, team/group/new_loader_completion/doc/asterisk.8
trunk/doc/asterisk.sgml
- copied unchanged from r40721, team/group/new_loader_completion/doc/asterisk.sgml
trunk/main/ (props changed)
- copied from r40721, team/group/new_loader_completion/main/
trunk/main/Makefile
- copied unchanged from r40721, team/group/new_loader_completion/main/Makefile
trunk/main/abstract_jb.c
- copied unchanged from r40721, team/group/new_loader_completion/main/abstract_jb.c
trunk/main/acl.c
- copied unchanged from r40721, team/group/new_loader_completion/main/acl.c
trunk/main/aescrypt.c
- copied unchanged from r40721, team/group/new_loader_completion/main/aescrypt.c
trunk/main/aeskey.c
- copied unchanged from r40721, team/group/new_loader_completion/main/aeskey.c
trunk/main/aesopt.h
- copied unchanged from r40721, team/group/new_loader_completion/main/aesopt.h
trunk/main/aestab.c
- copied unchanged from r40721, team/group/new_loader_completion/main/aestab.c
trunk/main/alaw.c
- copied unchanged from r40721, team/group/new_loader_completion/main/alaw.c
trunk/main/app.c
- copied unchanged from r40721, team/group/new_loader_completion/main/app.c
trunk/main/ast_expr2.fl
- copied unchanged from r40721, team/group/new_loader_completion/main/ast_expr2.fl
trunk/main/ast_expr2.h
- copied unchanged from r40721, team/group/new_loader_completion/main/ast_expr2.h
trunk/main/ast_expr2.y
- copied unchanged from r40721, team/group/new_loader_completion/main/ast_expr2.y
trunk/main/ast_expr2f.c
- copied, changed from r40721, team/group/new_loader_completion/main/ast_expr2f.c
trunk/main/asterisk.c
- copied unchanged from r40721, team/group/new_loader_completion/main/asterisk.c
trunk/main/astmm.c
- copied unchanged from r40721, team/group/new_loader_completion/main/astmm.c
trunk/main/autoservice.c
- copied unchanged from r40721, team/group/new_loader_completion/main/autoservice.c
trunk/main/buildinfo.c
- copied unchanged from r40721, team/group/new_loader_completion/main/buildinfo.c
trunk/main/callerid.c
- copied unchanged from r40721, team/group/new_loader_completion/main/callerid.c
trunk/main/cdr.c
- copied unchanged from r40721, team/group/new_loader_completion/main/cdr.c
trunk/main/channel.c
- copied unchanged from r40721, team/group/new_loader_completion/main/channel.c
trunk/main/chanvars.c
- copied unchanged from r40721, team/group/new_loader_completion/main/chanvars.c
trunk/main/cli.c
- copied unchanged from r40721, team/group/new_loader_completion/main/cli.c
trunk/main/coef_in.h
- copied unchanged from r40721, team/group/new_loader_completion/main/coef_in.h
trunk/main/coef_out.h
- copied unchanged from r40721, team/group/new_loader_completion/main/coef_out.h
trunk/main/config.c
- copied unchanged from r40721, team/group/new_loader_completion/main/config.c
trunk/main/cryptostub.c
- copied unchanged from r40721, team/group/new_loader_completion/main/cryptostub.c
trunk/main/db.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db.c
trunk/main/db1-ast/ (props changed)
- copied from r40721, team/group/new_loader_completion/main/db1-ast/
trunk/main/db1-ast/Makefile
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/Makefile
trunk/main/db1-ast/btree/
- copied from r40721, team/group/new_loader_completion/main/db1-ast/btree/
trunk/main/db1-ast/btree/bt_close.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_close.c
trunk/main/db1-ast/btree/bt_conv.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_conv.c
trunk/main/db1-ast/btree/bt_debug.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_debug.c
trunk/main/db1-ast/btree/bt_delete.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_delete.c
trunk/main/db1-ast/btree/bt_get.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_get.c
trunk/main/db1-ast/btree/bt_open.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_open.c
trunk/main/db1-ast/btree/bt_overflow.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_overflow.c
trunk/main/db1-ast/btree/bt_page.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_page.c
trunk/main/db1-ast/btree/bt_put.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_put.c
trunk/main/db1-ast/btree/bt_search.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_search.c
trunk/main/db1-ast/btree/bt_seq.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_seq.c
trunk/main/db1-ast/btree/bt_split.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_split.c
trunk/main/db1-ast/btree/bt_utils.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/bt_utils.c
trunk/main/db1-ast/btree/btree.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/btree.h
trunk/main/db1-ast/btree/extern.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/btree/extern.h
trunk/main/db1-ast/db/
- copied from r40721, team/group/new_loader_completion/main/db1-ast/db/
trunk/main/db1-ast/db/db.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/db/db.c
trunk/main/db1-ast/hash/
- copied from r40721, team/group/new_loader_completion/main/db1-ast/hash/
trunk/main/db1-ast/hash/README
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/README
trunk/main/db1-ast/hash/extern.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/extern.h
trunk/main/db1-ast/hash/hash.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hash.c
trunk/main/db1-ast/hash/hash.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hash.h
trunk/main/db1-ast/hash/hash_bigkey.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hash_bigkey.c
trunk/main/db1-ast/hash/hash_buf.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hash_buf.c
trunk/main/db1-ast/hash/hash_func.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hash_func.c
trunk/main/db1-ast/hash/hash_log2.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hash_log2.c
trunk/main/db1-ast/hash/hash_page.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hash_page.c
trunk/main/db1-ast/hash/hsearch.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/hsearch.c
trunk/main/db1-ast/hash/ndbm.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/ndbm.c
trunk/main/db1-ast/hash/page.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/page.h
trunk/main/db1-ast/hash/search.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/hash/search.h
trunk/main/db1-ast/include/
- copied from r40721, team/group/new_loader_completion/main/db1-ast/include/
trunk/main/db1-ast/include/circ-queue.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/include/circ-queue.h
trunk/main/db1-ast/include/compat.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/include/compat.h
trunk/main/db1-ast/include/db.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/include/db.h
trunk/main/db1-ast/include/mpool.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/include/mpool.h
trunk/main/db1-ast/include/ndbm.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/include/ndbm.h
trunk/main/db1-ast/libdb.map
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/libdb.map
trunk/main/db1-ast/mpool/
- copied from r40721, team/group/new_loader_completion/main/db1-ast/mpool/
trunk/main/db1-ast/mpool/README
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/mpool/README
trunk/main/db1-ast/mpool/mpool.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/mpool/mpool.c
trunk/main/db1-ast/recno/
- copied from r40721, team/group/new_loader_completion/main/db1-ast/recno/
trunk/main/db1-ast/recno/extern.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/extern.h
trunk/main/db1-ast/recno/rec_close.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_close.c
trunk/main/db1-ast/recno/rec_delete.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_delete.c
trunk/main/db1-ast/recno/rec_get.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_get.c
trunk/main/db1-ast/recno/rec_open.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_open.c
trunk/main/db1-ast/recno/rec_put.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_put.c
trunk/main/db1-ast/recno/rec_search.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_search.c
trunk/main/db1-ast/recno/rec_seq.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_seq.c
trunk/main/db1-ast/recno/rec_utils.c
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/rec_utils.c
trunk/main/db1-ast/recno/recno.h
- copied unchanged from r40721, team/group/new_loader_completion/main/db1-ast/recno/recno.h
trunk/main/devicestate.c
- copied unchanged from r40721, team/group/new_loader_completion/main/devicestate.c
trunk/main/dlfcn.c
- copied unchanged from r40721, team/group/new_loader_completion/main/dlfcn.c
trunk/main/dns.c
- copied unchanged from r40721, team/group/new_loader_completion/main/dns.c
trunk/main/dnsmgr.c
- copied unchanged from r40721, team/group/new_loader_completion/main/dnsmgr.c
trunk/main/dsp.c
- copied unchanged from r40721, team/group/new_loader_completion/main/dsp.c
trunk/main/ecdisa.h
- copied unchanged from r40721, team/group/new_loader_completion/main/ecdisa.h
trunk/main/editline/ (props changed)
- copied from r40721, team/group/new_loader_completion/main/editline/
trunk/main/editline/CHANGES
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/CHANGES
trunk/main/editline/INSTALL
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/INSTALL
trunk/main/editline/Makefile.in
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/Makefile.in
trunk/main/editline/PLATFORMS
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/PLATFORMS
trunk/main/editline/README
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/README
trunk/main/editline/TEST/
- copied from r40721, team/group/new_loader_completion/main/editline/TEST/
trunk/main/editline/TEST/test.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/TEST/test.c
trunk/main/editline/chared.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/chared.c
trunk/main/editline/chared.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/chared.h
trunk/main/editline/common.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/common.c
trunk/main/editline/config.guess
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/config.guess
trunk/main/editline/config.h.in
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/config.h.in
trunk/main/editline/config.sub
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/config.sub
trunk/main/editline/configure
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/configure
trunk/main/editline/configure.in
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/configure.in
trunk/main/editline/editline.3
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/editline.3
trunk/main/editline/editrc.5
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/editrc.5
trunk/main/editline/el.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/el.c
trunk/main/editline/el.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/el.h
trunk/main/editline/emacs.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/emacs.c
trunk/main/editline/hist.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/hist.c
trunk/main/editline/hist.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/hist.h
trunk/main/editline/histedit.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/histedit.h
trunk/main/editline/history.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/history.c
trunk/main/editline/install-sh
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/install-sh
trunk/main/editline/key.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/key.c
trunk/main/editline/key.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/key.h
trunk/main/editline/makelist
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/makelist
trunk/main/editline/map.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/map.c
trunk/main/editline/map.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/map.h
trunk/main/editline/np/ (props changed)
- copied from r40721, team/group/new_loader_completion/main/editline/np/
trunk/main/editline/np/fgetln.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/np/fgetln.c
trunk/main/editline/np/strlcat.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/np/strlcat.c
trunk/main/editline/np/strlcpy.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/np/strlcpy.c
trunk/main/editline/np/unvis.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/np/unvis.c
trunk/main/editline/np/vis.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/np/vis.c
trunk/main/editline/np/vis.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/np/vis.h
trunk/main/editline/parse.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/parse.c
trunk/main/editline/parse.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/parse.h
trunk/main/editline/prompt.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/prompt.c
trunk/main/editline/prompt.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/prompt.h
trunk/main/editline/read.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/read.c
trunk/main/editline/read.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/read.h
trunk/main/editline/readline/
- copied from r40721, team/group/new_loader_completion/main/editline/readline/
trunk/main/editline/readline.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/readline.c
trunk/main/editline/readline/readline.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/readline/readline.h
trunk/main/editline/refresh.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/refresh.c
trunk/main/editline/refresh.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/refresh.h
trunk/main/editline/search.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/search.c
trunk/main/editline/search.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/search.h
trunk/main/editline/sig.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/sig.c
trunk/main/editline/sig.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/sig.h
trunk/main/editline/sys.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/sys.h
trunk/main/editline/term.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/term.c
trunk/main/editline/term.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/term.h
trunk/main/editline/tokenizer.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/tokenizer.c
trunk/main/editline/tokenizer.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/tokenizer.h
trunk/main/editline/tty.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/tty.c
trunk/main/editline/tty.h
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/tty.h
trunk/main/editline/vi.c
- copied unchanged from r40721, team/group/new_loader_completion/main/editline/vi.c
trunk/main/enum.c
- copied unchanged from r40721, team/group/new_loader_completion/main/enum.c
trunk/main/file.c
- copied unchanged from r40721, team/group/new_loader_completion/main/file.c
trunk/main/fixedjitterbuf.c
- copied unchanged from r40721, team/group/new_loader_completion/main/fixedjitterbuf.c
trunk/main/fixedjitterbuf.h
- copied unchanged from r40721, team/group/new_loader_completion/main/fixedjitterbuf.h
trunk/main/frame.c
- copied unchanged from r40721, team/group/new_loader_completion/main/frame.c
trunk/main/fskmodem.c
- copied unchanged from r40721, team/group/new_loader_completion/main/fskmodem.c
trunk/main/http.c
- copied unchanged from r40721, team/group/new_loader_completion/main/http.c
trunk/main/image.c
- copied unchanged from r40721, team/group/new_loader_completion/main/image.c
trunk/main/indications.c
- copied unchanged from r40721, team/group/new_loader_completion/main/indications.c
trunk/main/io.c
- copied unchanged from r40721, team/group/new_loader_completion/main/io.c
trunk/main/jitterbuf.c
- copied unchanged from r40721, team/group/new_loader_completion/main/jitterbuf.c
trunk/main/jitterbuf.h
- copied unchanged from r40721, team/group/new_loader_completion/main/jitterbuf.h
trunk/main/loader.c
- copied unchanged from r40721, team/group/new_loader_completion/main/loader.c
trunk/main/logger.c
- copied unchanged from r40721, team/group/new_loader_completion/main/logger.c
trunk/main/manager.c
- copied unchanged from r40721, team/group/new_loader_completion/main/manager.c
trunk/main/md5.c
- copied unchanged from r40721, team/group/new_loader_completion/main/md5.c
trunk/main/netsock.c
- copied unchanged from r40721, team/group/new_loader_completion/main/netsock.c
trunk/main/pbx.c
- copied unchanged from r40721, team/group/new_loader_completion/main/pbx.c
trunk/main/plc.c
- copied unchanged from r40721, team/group/new_loader_completion/main/plc.c
trunk/main/poll.c
- copied unchanged from r40721, team/group/new_loader_completion/main/poll.c
trunk/main/privacy.c
- copied unchanged from r40721, team/group/new_loader_completion/main/privacy.c
trunk/main/rtp.c
- copied unchanged from r40721, team/group/new_loader_completion/main/rtp.c
trunk/main/say.c
- copied unchanged from r40721, team/group/new_loader_completion/main/say.c
trunk/main/sched.c
- copied unchanged from r40721, team/group/new_loader_completion/main/sched.c
trunk/main/sha1.c
- copied unchanged from r40721, team/group/new_loader_completion/main/sha1.c
trunk/main/slinfactory.c
- copied unchanged from r40721, team/group/new_loader_completion/main/slinfactory.c
trunk/main/srv.c
- copied unchanged from r40721, team/group/new_loader_completion/main/srv.c
trunk/main/stdtime/ (props changed)
- copied from r40721, team/group/new_loader_completion/main/stdtime/
trunk/main/stdtime/Makefile
- copied unchanged from r40721, team/group/new_loader_completion/main/stdtime/Makefile
trunk/main/stdtime/localtime.c
- copied unchanged from r40721, team/group/new_loader_completion/main/stdtime/localtime.c
trunk/main/stdtime/private.h
- copied unchanged from r40721, team/group/new_loader_completion/main/stdtime/private.h
trunk/main/stdtime/test.c
- copied unchanged from r40721, team/group/new_loader_completion/main/stdtime/test.c
trunk/main/stdtime/tzfile.h
- copied unchanged from r40721, team/group/new_loader_completion/main/stdtime/tzfile.h
trunk/main/strcompat.c
- copied unchanged from r40721, team/group/new_loader_completion/main/strcompat.c
trunk/main/tdd.c
- copied unchanged from r40721, team/group/new_loader_completion/main/tdd.c
trunk/main/term.c
- copied unchanged from r40721, team/group/new_loader_completion/main/term.c
trunk/main/translate.c
- copied unchanged from r40721, team/group/new_loader_completion/main/translate.c
trunk/main/udptl.c
- copied unchanged from r40721, team/group/new_loader_completion/main/udptl.c
trunk/main/ulaw.c
- copied unchanged from r40721, team/group/new_loader_completion/main/ulaw.c
trunk/main/utils.c
- copied unchanged from r40721, team/group/new_loader_completion/main/utils.c
trunk/utils/muted.c
- copied unchanged from r40721, team/group/new_loader_completion/utils/muted.c
Removed:
trunk/abstract_jb.c
trunk/acl.c
trunk/aescrypt.c
trunk/aeskey.c
trunk/aesopt.h
trunk/aestab.c
trunk/alaw.c
trunk/app.c
trunk/ast_expr2.c
trunk/ast_expr2.fl
trunk/ast_expr2.h
trunk/ast_expr2.y
trunk/ast_expr2f.c
trunk/asterisk.8
trunk/asterisk.c
trunk/asterisk.sgml
trunk/astmm.c
trunk/autoservice.c
trunk/buildinfo.c
trunk/callerid.c
trunk/cdr.c
trunk/channel.c
trunk/chanvars.c
trunk/cli.c
trunk/coef_in.h
trunk/coef_out.h
trunk/config.c
trunk/cryptostub.c
trunk/cygwin/
trunk/db.c
trunk/db1-ast/
trunk/devicestate.c
trunk/dlfcn.c
trunk/dns.c
trunk/dnsmgr.c
trunk/dsp.c
trunk/ecdisa.h
trunk/editline/
trunk/enum.c
trunk/file.c
trunk/fixedjitterbuf.c
trunk/fixedjitterbuf.h
trunk/frame.c
trunk/fskmodem.c
trunk/http.c
trunk/image.c
trunk/indications.c
trunk/io.c
trunk/jitterbuf.c
trunk/jitterbuf.h
trunk/loader.c
trunk/logger.c
trunk/manager.c
trunk/md5.c
trunk/muted.c
trunk/netsock.c
trunk/pbx.c
trunk/plc.c
trunk/poll.c
trunk/privacy.c
trunk/rtp.c
trunk/say.c
trunk/sched.c
trunk/sha1.c
trunk/slinfactory.c
trunk/sounds.txt
trunk/srv.c
trunk/stdtime/
trunk/strcompat.c
trunk/tdd.c
trunk/term.c
trunk/translate.c
trunk/udptl.c
trunk/ulaw.c
trunk/utils.c
Modified:
trunk/ (props changed)
trunk/.cleancount
trunk/Makefile
trunk/Makefile.moddir_rules
trunk/Makefile.rules
trunk/acinclude.m4
trunk/apps/ (props changed)
trunk/apps/Makefile
trunk/apps/app_adsiprog.c
trunk/apps/app_alarmreceiver.c
trunk/apps/app_amd.c
trunk/apps/app_authenticate.c
trunk/apps/app_cdr.c
trunk/apps/app_chanisavail.c
trunk/apps/app_channelredirect.c
trunk/apps/app_chanspy.c
trunk/apps/app_controlplayback.c
trunk/apps/app_db.c
trunk/apps/app_dial.c
trunk/apps/app_dictate.c
trunk/apps/app_directed_pickup.c
trunk/apps/app_directory.c
trunk/apps/app_disa.c
trunk/apps/app_dumpchan.c
trunk/apps/app_echo.c
trunk/apps/app_exec.c
trunk/apps/app_externalivr.c
trunk/apps/app_festival.c
trunk/apps/app_flash.c
trunk/apps/app_followme.c
trunk/apps/app_forkcdr.c
trunk/apps/app_getcpeid.c
trunk/apps/app_hasnewvoicemail.c
trunk/apps/app_ices.c
trunk/apps/app_image.c
trunk/apps/app_ivrdemo.c
trunk/apps/app_lookupblacklist.c
trunk/apps/app_lookupcidname.c
trunk/apps/app_macro.c
trunk/apps/app_meetme.c
trunk/apps/app_milliwatt.c
trunk/apps/app_mixmonitor.c
trunk/apps/app_morsecode.c
trunk/apps/app_mp3.c
trunk/apps/app_nbscat.c
trunk/apps/app_osplookup.c
trunk/apps/app_page.c
trunk/apps/app_parkandannounce.c
trunk/apps/app_playback.c
trunk/apps/app_privacy.c
trunk/apps/app_queue.c
trunk/apps/app_random.c
trunk/apps/app_read.c
trunk/apps/app_readfile.c
trunk/apps/app_realtime.c
trunk/apps/app_record.c
trunk/apps/app_rpt.c
trunk/apps/app_sayunixtime.c
trunk/apps/app_senddtmf.c
trunk/apps/app_sendtext.c
trunk/apps/app_setcallerid.c
trunk/apps/app_setcdruserfield.c
trunk/apps/app_settransfercapability.c
trunk/apps/app_skel.c
trunk/apps/app_sms.c
trunk/apps/app_softhangup.c
trunk/apps/app_speech_utils.c
trunk/apps/app_stack.c
trunk/apps/app_system.c
trunk/apps/app_talkdetect.c
trunk/apps/app_test.c
trunk/apps/app_transfer.c
trunk/apps/app_url.c
trunk/apps/app_userevent.c
trunk/apps/app_verbose.c
trunk/apps/app_voicemail.c
trunk/apps/app_waitforring.c
trunk/apps/app_waitforsilence.c
trunk/apps/app_while.c
trunk/apps/app_zapateller.c
trunk/apps/app_zapbarge.c
trunk/apps/app_zapras.c
trunk/apps/app_zapscan.c
trunk/build_tools/cflags.xml
trunk/build_tools/menuselect-deps.in
trunk/build_tools/prep_moduledeps
trunk/cdr/ (props changed)
trunk/cdr/Makefile
trunk/cdr/cdr_csv.c
trunk/cdr/cdr_custom.c
trunk/cdr/cdr_manager.c
trunk/cdr/cdr_odbc.c
trunk/cdr/cdr_pgsql.c
trunk/cdr/cdr_radius.c
trunk/cdr/cdr_sqlite.c
trunk/cdr/cdr_tds.c
trunk/channels/ (props changed)
trunk/channels/Makefile
trunk/channels/chan_agent.c
trunk/channels/chan_alsa.c
trunk/channels/chan_features.c
trunk/channels/chan_h323.c
trunk/channels/chan_iax2.c
trunk/channels/chan_jingle.c
trunk/channels/chan_local.c
trunk/channels/chan_mgcp.c
trunk/channels/chan_misdn.c
trunk/channels/chan_nbs.c
trunk/channels/chan_oss.c
trunk/channels/chan_phone.c
trunk/channels/chan_sip.c
trunk/channels/chan_skinny.c
trunk/channels/chan_zap.c
trunk/channels/h323/Makefile
trunk/channels/misdn/Makefile
trunk/channels/misdn/ie.c
trunk/channels/misdn/isdn_lib.c
trunk/channels/misdn/isdn_lib.h
trunk/channels/misdn/isdn_lib_intern.h
trunk/channels/misdn/isdn_msg_parser.c
trunk/codecs/ (props changed)
trunk/codecs/Makefile
trunk/codecs/codec_a_mu.c
trunk/codecs/codec_adpcm.c
trunk/codecs/codec_alaw.c
trunk/codecs/codec_g726.c
trunk/codecs/codec_gsm.c
trunk/codecs/codec_ilbc.c
trunk/codecs/codec_lpc10.c
trunk/codecs/codec_speex.c
trunk/codecs/codec_ulaw.c
trunk/codecs/codec_zap.c
trunk/codecs/gsm/Makefile
trunk/configure
trunk/configure.ac
trunk/formats/ (props changed)
trunk/formats/Makefile
trunk/formats/format_g723.c
trunk/formats/format_g726.c
trunk/formats/format_g729.c
trunk/formats/format_gsm.c
trunk/formats/format_h263.c
trunk/formats/format_h264.c
trunk/formats/format_ilbc.c
trunk/formats/format_jpeg.c
trunk/formats/format_ogg_vorbis.c
trunk/formats/format_pcm.c
trunk/formats/format_sln.c
trunk/formats/format_vox.c
trunk/formats/format_wav.c
trunk/formats/format_wav_gsm.c
trunk/funcs/ (props changed)
trunk/funcs/Makefile
trunk/funcs/func_base64.c
trunk/funcs/func_callerid.c
trunk/funcs/func_cdr.c
trunk/funcs/func_channel.c
trunk/funcs/func_curl.c
trunk/funcs/func_cut.c
trunk/funcs/func_db.c
trunk/funcs/func_enum.c
trunk/funcs/func_env.c
trunk/funcs/func_global.c
trunk/funcs/func_groupcount.c
trunk/funcs/func_language.c
trunk/funcs/func_logic.c
trunk/funcs/func_math.c
trunk/funcs/func_md5.c
trunk/funcs/func_moh.c
trunk/funcs/func_odbc.c
trunk/funcs/func_rand.c
trunk/funcs/func_realtime.c
trunk/funcs/func_sha1.c
trunk/funcs/func_strings.c
trunk/funcs/func_timeout.c
trunk/funcs/func_uri.c
trunk/include/asterisk.h
trunk/include/asterisk/abstract_jb.h
trunk/include/asterisk/autoconfig.h.in
trunk/include/asterisk/cdr.h
trunk/include/asterisk/compiler.h
trunk/include/asterisk/dns.h
trunk/include/asterisk/file.h
trunk/include/asterisk/indications.h
trunk/include/asterisk/linkedlists.h
trunk/include/asterisk/lock.h
trunk/include/asterisk/module.h
trunk/include/asterisk/monitor.h
trunk/include/asterisk/srv.h
trunk/include/asterisk/translate.h
trunk/include/asterisk/utils.h
trunk/main/ast_expr2.c
trunk/makeopts.in
trunk/pbx/ (props changed)
trunk/pbx/Makefile
trunk/pbx/pbx_ael.c
trunk/pbx/pbx_config.c
trunk/pbx/pbx_dundi.c
trunk/pbx/pbx_loopback.c
trunk/pbx/pbx_realtime.c
trunk/pbx/pbx_spool.c
trunk/res/ (props changed)
trunk/res/Makefile
trunk/res/res_adsi.c
trunk/res/res_agi.c
trunk/res/res_clioriginate.c
trunk/res/res_config_odbc.c
trunk/res/res_config_pgsql.c
trunk/res/res_convert.c
trunk/res/res_crypto.c
trunk/res/res_features.c
trunk/res/res_indications.c
trunk/res/res_jabber.c
trunk/res/res_monitor.c
trunk/res/res_musiconhold.c
trunk/res/res_odbc.c
trunk/res/res_smdi.c
trunk/res/res_snmp.c
trunk/res/res_speech.c
trunk/sounds/Makefile
trunk/utils/Makefile
trunk/utils/ael_main.c
Propchange: trunk/
------------------------------------------------------------------------------
automerge = yes
Propchange: trunk/
------------------------------------------------------------------------------
automerge-email = kpfleming at digium.com
Propchange: trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sun Aug 20 21:11:39 2006
@@ -19,6 +19,7 @@
menuselect.makedeps
config.status
config.log
-makeopts.xml
+menuselect-tree
autom4te.cache
muted
+makeopts.embed_rules
Propchange: trunk/
------------------------------------------------------------------------------
svnmerge-integrated = /trunk:1-40697
Modified: trunk/.cleancount
URL: http://svn.digium.com/view/asterisk/trunk/.cleancount?rev=40722&r1=40721&r2=40722&view=diff
==============================================================================
--- trunk/.cleancount (original)
+++ trunk/.cleancount Sun Aug 20 21:11:39 2006
@@ -1,1 +1,1 @@
-21
+22
Modified: trunk/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/Makefile?rev=40722&r1=40721&r2=40722&view=diff
==============================================================================
--- trunk/Makefile (original)
+++ trunk/Makefile Sun Aug 20 21:11:39 2006
@@ -22,32 +22,15 @@
.EXPORT_ALL_VARIABLES:
+include makeopts
+
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
# Create OPTIONS variable
OPTIONS=
-# If cross compiling, define these to suit
-#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
-#CROSS_ARCH=Linux
-#CROSS_PROC=arm
-#SUB_PROC=xscale # or maverick
-
-ifeq ($(CROSS_COMPILE),)
- OSARCH:=$(shell uname -s)
- PROC?:=$(shell uname -m)
-else
- OSARCH=$(CROSS_ARCH)
- PROC=$(CROSS_PROC)
-endif
-
ASTTOPDIR:=$(shell pwd)
-
-# Remember the MAKELEVEL at the top
-MAKETOPLEVEL?=$(MAKELEVEL)
# Overwite config files on "make samples"
OVERWRITE=y
@@ -60,20 +43,7 @@
# For example, make DESTDIR=/tmp/asterisk woud put things in
# /tmp/asterisk/etc/asterisk
# !!! Watch out, put no spaces or comments after the value !!!
-DESTDIR?=
#DESTDIR?=/tmp/asterisk
-
-# Original busydetect routine
-#BUSYDETECT = -DBUSYDETECT
-
-# Improved busydetect routine, comment the previous one if you use this one
-#BUSYDETECT+= -DBUSYDETECT_MARTIN
-# Detect the busy signal looking only at tone lengths
-# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
-#BUSYDETECT+= -DBUSYDETECT_TONEONLY
-# Enforce the detection of busy signal (get rid of false hangups)
-# Don't use together with -DBUSYDETECT_TONEONLY
-#BUSYDETECT+= -DBUSYDETECT_COMPARE_TONE_AND_SILENCE
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -131,59 +101,10 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
- include menuselect.makeopts
- include menuselect.makedeps
- endif
-endif
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard makeopts),)
- include makeopts
- endif
-endif
-
-TOPDIR_CFLAGS=-Iinclude
-MOD_SUBDIR_CFLAGS=-I../include -I..
-OTHER_SUBDIR_CFLAGS=-I../include -I..
-
-ifeq ($(origin MENUSELECT_CFLAGS),undefined)
- MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .)
- ifeq ($(MENUSELECT_CFLAGS),)
- MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
- endif
- ifneq ($(MENUSELECT_CFLAGS),)
- MENUSELECT_CFLAGS:=$(shell echo $(MENUSELECT_CFLAGS) | cut -f2 -d'=')
- endif
-endif
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)))
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions. This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
- # Stack backtraces, while useful for debugging, are incompatible with optimizations
- ifeq ($(OSARCH),Linux)
- CFLAGS+=-DSTACK_BACKTRACES
- endif
-endif
-
-# *CLI> show memory allocations [filename]
-# *CLI> show memory summary [filename]
-ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
- TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
- MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
-endif
-
-MOD_SUBDIR_CFLAGS+=-fPIC
-
-ifeq ($(OSARCH),Linux)
+MOD_SUBDIR_CFLAGS=-I../include -I../main
+OTHER_SUBDIR_CFLAGS=-I../include
+
+ifeq ($(OSARCH),linux-gnu)
ifeq ($(PROC),x86_64)
# You must have GCC 3.4 to use k8, otherwise use athlon
PROC=k8
@@ -216,28 +137,21 @@
endif
endif
-GREP=grep
ID=id
ifeq ($(OSARCH),SunOS)
- GREP=/usr/xpg4/bin/grep
M4=/usr/local/bin/m4
ID=/usr/xpg4/bin/id
endif
ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-ifneq ($(OPTIMIZE),)
-ASTCFLAGS+=$(OPTIMIZE)
-endif
ifeq ($(AST_DEVMODE),yes)
ASTCFLAGS+=-Werror -Wunused
endif
-ASTOBJ=-o asterisk
-
-ifeq ($(findstring BSD,$(OSARCH)),BSD)
- ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+ifneq ($(findstring BSD,$(OSARCH)),)
+ ASTCFLAGS+=-I/usr/local/include -L/usr/local/lib
endif
ifneq ($(PROC),ultrasparc)
@@ -249,13 +163,13 @@
endif
ifeq ($(OSARCH),FreeBSD)
- BSDVERSION=$(shell make -V OSVERSION -f $(CROSS_COMPILE_TARGET)/usr/share/mk/bsd.port.subdir.mk)
+ BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
AST_LIBS+=$(shell if test $(BSDVERSION) -lt 502102 ; then echo "-lc_r"; else echo "-pthread"; fi)
-endif # FreeBSD
+endif
ifeq ($(OSARCH),NetBSD)
- AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
+ ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
ifeq ($(OSARCH),OpenBSD)
@@ -263,10 +177,8 @@
endif
ifeq ($(OSARCH),SunOS)
- ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I$(CROSS_COMPILE_TARGET)/opt/ssl/include -I$(CROSS_COMPILE_TARGET)/usr/local/ssl/include
-endif
-
-LIBEDIT=editline/libedit.a
+ ASTCFLAGS+=-Wcast-align -DSOLARIS -Iinclude/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+endif
ASTERISKVERSION:=$(shell build_tools/make_version .)
@@ -283,93 +195,35 @@
ASTCFLAGS+=$(MALLOC_DEBUG)$(BUSYDETECT)$(OPTIONS)
-MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs
+MOD_SUBDIRS:=res channels pbx apps codecs formats cdr funcs main
OTHER_SUBDIRS:=utils agi
+# Note: OTHER_SUBDIRS must be after MOD_SUBDIRS, because 'utils' uses files from 'main'
SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
SUBDIRS_CLEAN:=$(SUBDIRS:%=%-clean)
SUBDIRS_CLEAN_DEPEND:=$(SUBDIRS:%=%-clean-depend)
MOD_SUBDIRS_DEPEND:=$(MOD_SUBDIRS:%=%-depend)
OTHER_SUBDIRS_DEPEND:=$(OTHER_SUBDIRS:%=%-depend)
-SUBDIRS_DEPEND:=$(MOD_SUBDIRS_DEPEND) $(OTHER_SUBDIRS_DEPEND)
+SUBDIRS_DEPEND:=$(OTHER_SUBDIRS_DEPEND) $(MOD_SUBDIRS_DEPEND)
SUBDIRS_UNINSTALL:=$(SUBDIRS:%=%-uninstall)
-
-OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
[... 21474 lines stripped ...]
More information about the asterisk-commits
mailing list