[asterisk-commits] oej: branch oej/mp3 r40996 - in /team/oej/mp3: ./ agi/ apps/ build_tools/ cdr...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Thu Aug 24 12:57:10 MST 2006 

Author: oej
Date: Thu Aug 24 14:57:07 2006
New Revision: 40996

URL: http://svn.digium.com/view/asterisk?rev=40996&view=rev
Log:
Reset automerge after loader changes and stuff

Added:
    team/oej/mp3/build_tools/embed_modules.xml
      - copied unchanged from r40993, trunk/build_tools/embed_modules.xml
    team/oej/mp3/doc/asterisk.8
      - copied unchanged from r40993, trunk/doc/asterisk.8
    team/oej/mp3/doc/asterisk.sgml
      - copied unchanged from r40993, trunk/doc/asterisk.sgml
    team/oej/mp3/include/asterisk/paths.h
      - copied unchanged from r40993, trunk/include/asterisk/paths.h
    team/oej/mp3/main/   (props changed)
      - copied from r40993, trunk/main/
    team/oej/mp3/main/Makefile
      - copied unchanged from r40993, trunk/main/Makefile
    team/oej/mp3/main/abstract_jb.c
      - copied unchanged from r40993, trunk/main/abstract_jb.c
    team/oej/mp3/main/acl.c
      - copied unchanged from r40993, trunk/main/acl.c
    team/oej/mp3/main/aescrypt.c
      - copied unchanged from r40993, trunk/main/aescrypt.c
    team/oej/mp3/main/aeskey.c
      - copied unchanged from r40993, trunk/main/aeskey.c
    team/oej/mp3/main/aesopt.h
      - copied unchanged from r40993, trunk/main/aesopt.h
    team/oej/mp3/main/aestab.c
      - copied unchanged from r40993, trunk/main/aestab.c
    team/oej/mp3/main/alaw.c
      - copied unchanged from r40993, trunk/main/alaw.c
    team/oej/mp3/main/app.c
      - copied unchanged from r40993, trunk/main/app.c
    team/oej/mp3/main/ast_expr2.c
      - copied unchanged from r40993, trunk/main/ast_expr2.c
    team/oej/mp3/main/ast_expr2.fl
      - copied unchanged from r40993, trunk/main/ast_expr2.fl
    team/oej/mp3/main/ast_expr2.h
      - copied unchanged from r40993, trunk/main/ast_expr2.h
    team/oej/mp3/main/ast_expr2.y
      - copied unchanged from r40993, trunk/main/ast_expr2.y
    team/oej/mp3/main/ast_expr2f.c
      - copied unchanged from r40993, trunk/main/ast_expr2f.c
    team/oej/mp3/main/asterisk.c
      - copied unchanged from r40993, trunk/main/asterisk.c
    team/oej/mp3/main/astmm.c
      - copied unchanged from r40993, trunk/main/astmm.c
    team/oej/mp3/main/autoservice.c
      - copied unchanged from r40993, trunk/main/autoservice.c
    team/oej/mp3/main/buildinfo.c
      - copied unchanged from r40993, trunk/main/buildinfo.c
    team/oej/mp3/main/callerid.c
      - copied unchanged from r40993, trunk/main/callerid.c
    team/oej/mp3/main/cdr.c
      - copied unchanged from r40993, trunk/main/cdr.c
    team/oej/mp3/main/channel.c
      - copied unchanged from r40993, trunk/main/channel.c
    team/oej/mp3/main/chanvars.c
      - copied unchanged from r40993, trunk/main/chanvars.c
    team/oej/mp3/main/cli.c
      - copied unchanged from r40993, trunk/main/cli.c
    team/oej/mp3/main/coef_in.h
      - copied unchanged from r40993, trunk/main/coef_in.h
    team/oej/mp3/main/coef_out.h
      - copied unchanged from r40993, trunk/main/coef_out.h
    team/oej/mp3/main/config.c
      - copied unchanged from r40993, trunk/main/config.c
    team/oej/mp3/main/cryptostub.c
      - copied unchanged from r40993, trunk/main/cryptostub.c
    team/oej/mp3/main/db.c
      - copied unchanged from r40993, trunk/main/db.c
    team/oej/mp3/main/db1-ast/   (props changed)
      - copied from r40993, trunk/main/db1-ast/
    team/oej/mp3/main/db1-ast/Makefile
      - copied unchanged from r40993, trunk/main/db1-ast/Makefile
    team/oej/mp3/main/db1-ast/btree/
      - copied from r40993, trunk/main/db1-ast/btree/
    team/oej/mp3/main/db1-ast/btree/bt_close.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_close.c
    team/oej/mp3/main/db1-ast/btree/bt_conv.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_conv.c
    team/oej/mp3/main/db1-ast/btree/bt_debug.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_debug.c
    team/oej/mp3/main/db1-ast/btree/bt_delete.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_delete.c
    team/oej/mp3/main/db1-ast/btree/bt_get.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_get.c
    team/oej/mp3/main/db1-ast/btree/bt_open.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_open.c
    team/oej/mp3/main/db1-ast/btree/bt_overflow.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_overflow.c
    team/oej/mp3/main/db1-ast/btree/bt_page.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_page.c
    team/oej/mp3/main/db1-ast/btree/bt_put.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_put.c
    team/oej/mp3/main/db1-ast/btree/bt_search.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_search.c
    team/oej/mp3/main/db1-ast/btree/bt_seq.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_seq.c
    team/oej/mp3/main/db1-ast/btree/bt_split.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_split.c
    team/oej/mp3/main/db1-ast/btree/bt_utils.c
      - copied unchanged from r40993, trunk/main/db1-ast/btree/bt_utils.c
    team/oej/mp3/main/db1-ast/btree/btree.h
      - copied unchanged from r40993, trunk/main/db1-ast/btree/btree.h
    team/oej/mp3/main/db1-ast/btree/extern.h
      - copied unchanged from r40993, trunk/main/db1-ast/btree/extern.h
    team/oej/mp3/main/db1-ast/db/
      - copied from r40993, trunk/main/db1-ast/db/
    team/oej/mp3/main/db1-ast/db/db.c
      - copied unchanged from r40993, trunk/main/db1-ast/db/db.c
    team/oej/mp3/main/db1-ast/hash/
      - copied from r40993, trunk/main/db1-ast/hash/
    team/oej/mp3/main/db1-ast/hash/README
      - copied unchanged from r40993, trunk/main/db1-ast/hash/README
    team/oej/mp3/main/db1-ast/hash/extern.h
      - copied unchanged from r40993, trunk/main/db1-ast/hash/extern.h
    team/oej/mp3/main/db1-ast/hash/hash.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hash.c
    team/oej/mp3/main/db1-ast/hash/hash.h
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hash.h
    team/oej/mp3/main/db1-ast/hash/hash_bigkey.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hash_bigkey.c
    team/oej/mp3/main/db1-ast/hash/hash_buf.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hash_buf.c
    team/oej/mp3/main/db1-ast/hash/hash_func.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hash_func.c
    team/oej/mp3/main/db1-ast/hash/hash_log2.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hash_log2.c
    team/oej/mp3/main/db1-ast/hash/hash_page.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hash_page.c
    team/oej/mp3/main/db1-ast/hash/hsearch.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/hsearch.c
    team/oej/mp3/main/db1-ast/hash/ndbm.c
      - copied unchanged from r40993, trunk/main/db1-ast/hash/ndbm.c
    team/oej/mp3/main/db1-ast/hash/page.h
      - copied unchanged from r40993, trunk/main/db1-ast/hash/page.h
    team/oej/mp3/main/db1-ast/hash/search.h
      - copied unchanged from r40993, trunk/main/db1-ast/hash/search.h
    team/oej/mp3/main/db1-ast/include/
      - copied from r40993, trunk/main/db1-ast/include/
    team/oej/mp3/main/db1-ast/include/circ-queue.h
      - copied unchanged from r40993, trunk/main/db1-ast/include/circ-queue.h
    team/oej/mp3/main/db1-ast/include/compat.h
      - copied unchanged from r40993, trunk/main/db1-ast/include/compat.h
    team/oej/mp3/main/db1-ast/include/db.h
      - copied unchanged from r40993, trunk/main/db1-ast/include/db.h
    team/oej/mp3/main/db1-ast/include/mpool.h
      - copied unchanged from r40993, trunk/main/db1-ast/include/mpool.h
    team/oej/mp3/main/db1-ast/include/ndbm.h
      - copied unchanged from r40993, trunk/main/db1-ast/include/ndbm.h
    team/oej/mp3/main/db1-ast/libdb.map
      - copied unchanged from r40993, trunk/main/db1-ast/libdb.map
    team/oej/mp3/main/db1-ast/mpool/
      - copied from r40993, trunk/main/db1-ast/mpool/
    team/oej/mp3/main/db1-ast/mpool/README
      - copied unchanged from r40993, trunk/main/db1-ast/mpool/README
    team/oej/mp3/main/db1-ast/mpool/mpool.c
      - copied unchanged from r40993, trunk/main/db1-ast/mpool/mpool.c
    team/oej/mp3/main/db1-ast/recno/
      - copied from r40993, trunk/main/db1-ast/recno/
    team/oej/mp3/main/db1-ast/recno/extern.h
      - copied unchanged from r40993, trunk/main/db1-ast/recno/extern.h
    team/oej/mp3/main/db1-ast/recno/rec_close.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_close.c
    team/oej/mp3/main/db1-ast/recno/rec_delete.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_delete.c
    team/oej/mp3/main/db1-ast/recno/rec_get.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_get.c
    team/oej/mp3/main/db1-ast/recno/rec_open.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_open.c
    team/oej/mp3/main/db1-ast/recno/rec_put.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_put.c
    team/oej/mp3/main/db1-ast/recno/rec_search.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_search.c
    team/oej/mp3/main/db1-ast/recno/rec_seq.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_seq.c
    team/oej/mp3/main/db1-ast/recno/rec_utils.c
      - copied unchanged from r40993, trunk/main/db1-ast/recno/rec_utils.c
    team/oej/mp3/main/db1-ast/recno/recno.h
      - copied unchanged from r40993, trunk/main/db1-ast/recno/recno.h
    team/oej/mp3/main/devicestate.c
      - copied unchanged from r40993, trunk/main/devicestate.c
    team/oej/mp3/main/dlfcn.c
      - copied unchanged from r40993, trunk/main/dlfcn.c
    team/oej/mp3/main/dns.c
      - copied unchanged from r40993, trunk/main/dns.c
    team/oej/mp3/main/dnsmgr.c
      - copied unchanged from r40993, trunk/main/dnsmgr.c
    team/oej/mp3/main/dsp.c
      - copied unchanged from r40993, trunk/main/dsp.c
    team/oej/mp3/main/ecdisa.h
      - copied unchanged from r40993, trunk/main/ecdisa.h
    team/oej/mp3/main/editline/   (props changed)
      - copied from r40993, trunk/main/editline/
    team/oej/mp3/main/editline/CHANGES
      - copied unchanged from r40993, trunk/main/editline/CHANGES
    team/oej/mp3/main/editline/INSTALL
      - copied unchanged from r40993, trunk/main/editline/INSTALL
    team/oej/mp3/main/editline/Makefile.in
      - copied unchanged from r40993, trunk/main/editline/Makefile.in
    team/oej/mp3/main/editline/PLATFORMS
      - copied unchanged from r40993, trunk/main/editline/PLATFORMS
    team/oej/mp3/main/editline/README
      - copied unchanged from r40993, trunk/main/editline/README
    team/oej/mp3/main/editline/TEST/
      - copied from r40993, trunk/main/editline/TEST/
    team/oej/mp3/main/editline/TEST/test.c
      - copied unchanged from r40993, trunk/main/editline/TEST/test.c
    team/oej/mp3/main/editline/chared.c
      - copied unchanged from r40993, trunk/main/editline/chared.c
    team/oej/mp3/main/editline/chared.h
      - copied unchanged from r40993, trunk/main/editline/chared.h
    team/oej/mp3/main/editline/common.c
      - copied unchanged from r40993, trunk/main/editline/common.c
    team/oej/mp3/main/editline/config.guess
      - copied unchanged from r40993, trunk/main/editline/config.guess
    team/oej/mp3/main/editline/config.h.in
      - copied unchanged from r40993, trunk/main/editline/config.h.in
    team/oej/mp3/main/editline/config.sub
      - copied unchanged from r40993, trunk/main/editline/config.sub
    team/oej/mp3/main/editline/configure
      - copied unchanged from r40993, trunk/main/editline/configure
    team/oej/mp3/main/editline/configure.in
      - copied unchanged from r40993, trunk/main/editline/configure.in
    team/oej/mp3/main/editline/editline.3
      - copied unchanged from r40993, trunk/main/editline/editline.3
    team/oej/mp3/main/editline/editrc.5
      - copied unchanged from r40993, trunk/main/editline/editrc.5
    team/oej/mp3/main/editline/el.c
      - copied unchanged from r40993, trunk/main/editline/el.c
    team/oej/mp3/main/editline/el.h
      - copied unchanged from r40993, trunk/main/editline/el.h
    team/oej/mp3/main/editline/emacs.c
      - copied unchanged from r40993, trunk/main/editline/emacs.c
    team/oej/mp3/main/editline/hist.c
      - copied unchanged from r40993, trunk/main/editline/hist.c
    team/oej/mp3/main/editline/hist.h
      - copied unchanged from r40993, trunk/main/editline/hist.h
    team/oej/mp3/main/editline/histedit.h
      - copied unchanged from r40993, trunk/main/editline/histedit.h
    team/oej/mp3/main/editline/history.c
      - copied unchanged from r40993, trunk/main/editline/history.c
    team/oej/mp3/main/editline/install-sh
      - copied unchanged from r40993, trunk/main/editline/install-sh
    team/oej/mp3/main/editline/key.c
      - copied unchanged from r40993, trunk/main/editline/key.c
    team/oej/mp3/main/editline/key.h
      - copied unchanged from r40993, trunk/main/editline/key.h
    team/oej/mp3/main/editline/makelist
      - copied unchanged from r40993, trunk/main/editline/makelist
    team/oej/mp3/main/editline/map.c
      - copied unchanged from r40993, trunk/main/editline/map.c
    team/oej/mp3/main/editline/map.h
      - copied unchanged from r40993, trunk/main/editline/map.h
    team/oej/mp3/main/editline/np/   (props changed)
      - copied from r40993, trunk/main/editline/np/
    team/oej/mp3/main/editline/np/fgetln.c
      - copied unchanged from r40993, trunk/main/editline/np/fgetln.c
    team/oej/mp3/main/editline/np/strlcat.c
      - copied unchanged from r40993, trunk/main/editline/np/strlcat.c
    team/oej/mp3/main/editline/np/strlcpy.c
      - copied unchanged from r40993, trunk/main/editline/np/strlcpy.c
    team/oej/mp3/main/editline/np/unvis.c
      - copied unchanged from r40993, trunk/main/editline/np/unvis.c
    team/oej/mp3/main/editline/np/vis.c
      - copied unchanged from r40993, trunk/main/editline/np/vis.c
    team/oej/mp3/main/editline/np/vis.h
      - copied unchanged from r40993, trunk/main/editline/np/vis.h
    team/oej/mp3/main/editline/parse.c
      - copied unchanged from r40993, trunk/main/editline/parse.c
    team/oej/mp3/main/editline/parse.h
      - copied unchanged from r40993, trunk/main/editline/parse.h
    team/oej/mp3/main/editline/prompt.c
      - copied unchanged from r40993, trunk/main/editline/prompt.c
    team/oej/mp3/main/editline/prompt.h
      - copied unchanged from r40993, trunk/main/editline/prompt.h
    team/oej/mp3/main/editline/read.c
      - copied unchanged from r40993, trunk/main/editline/read.c
    team/oej/mp3/main/editline/read.h
      - copied unchanged from r40993, trunk/main/editline/read.h
    team/oej/mp3/main/editline/readline/
      - copied from r40993, trunk/main/editline/readline/
    team/oej/mp3/main/editline/readline.c
      - copied unchanged from r40993, trunk/main/editline/readline.c
    team/oej/mp3/main/editline/readline/readline.h
      - copied unchanged from r40993, trunk/main/editline/readline/readline.h
    team/oej/mp3/main/editline/refresh.c
      - copied unchanged from r40993, trunk/main/editline/refresh.c
    team/oej/mp3/main/editline/refresh.h
      - copied unchanged from r40993, trunk/main/editline/refresh.h
    team/oej/mp3/main/editline/search.c
      - copied unchanged from r40993, trunk/main/editline/search.c
    team/oej/mp3/main/editline/search.h
      - copied unchanged from r40993, trunk/main/editline/search.h
    team/oej/mp3/main/editline/sig.c
      - copied unchanged from r40993, trunk/main/editline/sig.c
    team/oej/mp3/main/editline/sig.h
      - copied unchanged from r40993, trunk/main/editline/sig.h
    team/oej/mp3/main/editline/sys.h
      - copied unchanged from r40993, trunk/main/editline/sys.h
    team/oej/mp3/main/editline/term.c
      - copied unchanged from r40993, trunk/main/editline/term.c
    team/oej/mp3/main/editline/term.h
      - copied unchanged from r40993, trunk/main/editline/term.h
    team/oej/mp3/main/editline/tokenizer.c
      - copied unchanged from r40993, trunk/main/editline/tokenizer.c
    team/oej/mp3/main/editline/tokenizer.h
      - copied unchanged from r40993, trunk/main/editline/tokenizer.h
    team/oej/mp3/main/editline/tty.c
      - copied unchanged from r40993, trunk/main/editline/tty.c
    team/oej/mp3/main/editline/tty.h
      - copied unchanged from r40993, trunk/main/editline/tty.h
    team/oej/mp3/main/editline/vi.c
      - copied unchanged from r40993, trunk/main/editline/vi.c
    team/oej/mp3/main/enum.c
      - copied unchanged from r40993, trunk/main/enum.c
    team/oej/mp3/main/file.c
      - copied unchanged from r40993, trunk/main/file.c
    team/oej/mp3/main/fixedjitterbuf.c
      - copied unchanged from r40993, trunk/main/fixedjitterbuf.c
    team/oej/mp3/main/fixedjitterbuf.h
      - copied unchanged from r40993, trunk/main/fixedjitterbuf.h
    team/oej/mp3/main/frame.c
      - copied unchanged from r40993, trunk/main/frame.c
    team/oej/mp3/main/fskmodem.c
      - copied unchanged from r40993, trunk/main/fskmodem.c
    team/oej/mp3/main/http.c
      - copied unchanged from r40993, trunk/main/http.c
    team/oej/mp3/main/image.c
      - copied unchanged from r40993, trunk/main/image.c
    team/oej/mp3/main/indications.c
      - copied unchanged from r40993, trunk/main/indications.c
    team/oej/mp3/main/io.c
      - copied unchanged from r40993, trunk/main/io.c
    team/oej/mp3/main/jitterbuf.c
      - copied unchanged from r40993, trunk/main/jitterbuf.c
    team/oej/mp3/main/jitterbuf.h
      - copied unchanged from r40993, trunk/main/jitterbuf.h
    team/oej/mp3/main/loader.c
      - copied unchanged from r40993, trunk/main/loader.c
    team/oej/mp3/main/logger.c
      - copied unchanged from r40993, trunk/main/logger.c
    team/oej/mp3/main/manager.c
      - copied unchanged from r40993, trunk/main/manager.c
    team/oej/mp3/main/md5.c
      - copied unchanged from r40993, trunk/main/md5.c
    team/oej/mp3/main/netsock.c
      - copied unchanged from r40993, trunk/main/netsock.c
    team/oej/mp3/main/pbx.c
      - copied unchanged from r40993, trunk/main/pbx.c
    team/oej/mp3/main/plc.c
      - copied unchanged from r40993, trunk/main/plc.c
    team/oej/mp3/main/poll.c
      - copied unchanged from r40993, trunk/main/poll.c
    team/oej/mp3/main/privacy.c
      - copied unchanged from r40993, trunk/main/privacy.c
    team/oej/mp3/main/rtp.c
      - copied unchanged from r40993, trunk/main/rtp.c
    team/oej/mp3/main/say.c
      - copied unchanged from r40993, trunk/main/say.c
    team/oej/mp3/main/sched.c
      - copied unchanged from r40993, trunk/main/sched.c
    team/oej/mp3/main/sha1.c
      - copied unchanged from r40993, trunk/main/sha1.c
    team/oej/mp3/main/slinfactory.c
      - copied unchanged from r40993, trunk/main/slinfactory.c
    team/oej/mp3/main/srv.c
      - copied unchanged from r40993, trunk/main/srv.c
    team/oej/mp3/main/stdtime/   (props changed)
      - copied from r40993, trunk/main/stdtime/
    team/oej/mp3/main/stdtime/Makefile
      - copied unchanged from r40993, trunk/main/stdtime/Makefile
    team/oej/mp3/main/stdtime/localtime.c
      - copied unchanged from r40993, trunk/main/stdtime/localtime.c
    team/oej/mp3/main/stdtime/test.c
      - copied unchanged from r40993, trunk/main/stdtime/test.c
    team/oej/mp3/main/stdtime/tzfile.h
      - copied unchanged from r40993, trunk/main/stdtime/tzfile.h
    team/oej/mp3/main/strcompat.c
      - copied unchanged from r40993, trunk/main/strcompat.c
    team/oej/mp3/main/tdd.c
      - copied unchanged from r40993, trunk/main/tdd.c
    team/oej/mp3/main/term.c
      - copied unchanged from r40993, trunk/main/term.c
    team/oej/mp3/main/translate.c
      - copied unchanged from r40993, trunk/main/translate.c
    team/oej/mp3/main/udptl.c
      - copied unchanged from r40993, trunk/main/udptl.c
    team/oej/mp3/main/ulaw.c
      - copied unchanged from r40993, trunk/main/ulaw.c
    team/oej/mp3/main/utils.c
      - copied unchanged from r40993, trunk/main/utils.c
    team/oej/mp3/utils/muted.c
      - copied unchanged from r40993, trunk/utils/muted.c
Removed:
    team/oej/mp3/abstract_jb.c
    team/oej/mp3/acl.c
    team/oej/mp3/aescrypt.c
    team/oej/mp3/aeskey.c
    team/oej/mp3/aesopt.h
    team/oej/mp3/aestab.c
    team/oej/mp3/alaw.c
    team/oej/mp3/app.c
    team/oej/mp3/ast_expr2.c
    team/oej/mp3/ast_expr2.fl
    team/oej/mp3/ast_expr2.h
    team/oej/mp3/ast_expr2.y
    team/oej/mp3/ast_expr2f.c
    team/oej/mp3/asterisk.8
    team/oej/mp3/asterisk.c
    team/oej/mp3/asterisk.sgml
    team/oej/mp3/astmm.c
    team/oej/mp3/autoservice.c
    team/oej/mp3/buildinfo.c
    team/oej/mp3/callerid.c
    team/oej/mp3/cdr.c
    team/oej/mp3/channel.c
    team/oej/mp3/chanvars.c
    team/oej/mp3/cli.c
    team/oej/mp3/coef_in.h
    team/oej/mp3/coef_out.h
    team/oej/mp3/config.c
    team/oej/mp3/cryptostub.c
    team/oej/mp3/cygwin/
    team/oej/mp3/db.c
    team/oej/mp3/db1-ast/
    team/oej/mp3/devicestate.c
    team/oej/mp3/dlfcn.c
    team/oej/mp3/dns.c
    team/oej/mp3/dnsmgr.c
    team/oej/mp3/dsp.c
    team/oej/mp3/ecdisa.h
    team/oej/mp3/editline/
    team/oej/mp3/enum.c
    team/oej/mp3/file.c
    team/oej/mp3/fixedjitterbuf.c
    team/oej/mp3/fixedjitterbuf.h
    team/oej/mp3/frame.c
    team/oej/mp3/fskmodem.c
    team/oej/mp3/http.c
    team/oej/mp3/image.c
    team/oej/mp3/indications.c
    team/oej/mp3/io.c
    team/oej/mp3/jitterbuf.c
    team/oej/mp3/jitterbuf.h
    team/oej/mp3/loader.c
    team/oej/mp3/logger.c
    team/oej/mp3/manager.c
    team/oej/mp3/md5.c
    team/oej/mp3/muted.c
    team/oej/mp3/netsock.c
    team/oej/mp3/pbx.c
    team/oej/mp3/plc.c
    team/oej/mp3/poll.c
    team/oej/mp3/privacy.c
    team/oej/mp3/rtp.c
    team/oej/mp3/say.c
    team/oej/mp3/sched.c
    team/oej/mp3/sha1.c
    team/oej/mp3/slinfactory.c
    team/oej/mp3/sounds.txt
    team/oej/mp3/srv.c
    team/oej/mp3/stdtime/
    team/oej/mp3/strcompat.c
    team/oej/mp3/tdd.c
    team/oej/mp3/term.c
    team/oej/mp3/translate.c
    team/oej/mp3/udptl.c
    team/oej/mp3/ulaw.c
    team/oej/mp3/utils.c
Modified:
    team/oej/mp3/   (props changed)
    team/oej/mp3/.cleancount
    team/oej/mp3/Makefile
    team/oej/mp3/Makefile.moddir_rules
    team/oej/mp3/Makefile.rules
    team/oej/mp3/UPGRADE.txt
    team/oej/mp3/acinclude.m4
    team/oej/mp3/agi/Makefile
    team/oej/mp3/apps/   (props changed)
    team/oej/mp3/apps/Makefile
    team/oej/mp3/apps/app_adsiprog.c
    team/oej/mp3/apps/app_alarmreceiver.c
    team/oej/mp3/apps/app_amd.c
    team/oej/mp3/apps/app_authenticate.c
    team/oej/mp3/apps/app_cdr.c
    team/oej/mp3/apps/app_chanisavail.c
    team/oej/mp3/apps/app_channelredirect.c
    team/oej/mp3/apps/app_chanspy.c
    team/oej/mp3/apps/app_controlplayback.c
    team/oej/mp3/apps/app_db.c
    team/oej/mp3/apps/app_dial.c
    team/oej/mp3/apps/app_dictate.c
    team/oej/mp3/apps/app_directed_pickup.c
    team/oej/mp3/apps/app_directory.c
    team/oej/mp3/apps/app_disa.c
    team/oej/mp3/apps/app_dumpchan.c
    team/oej/mp3/apps/app_echo.c
    team/oej/mp3/apps/app_exec.c
    team/oej/mp3/apps/app_externalivr.c
    team/oej/mp3/apps/app_festival.c
    team/oej/mp3/apps/app_flash.c
    team/oej/mp3/apps/app_followme.c
    team/oej/mp3/apps/app_forkcdr.c
    team/oej/mp3/apps/app_getcpeid.c
    team/oej/mp3/apps/app_hasnewvoicemail.c
    team/oej/mp3/apps/app_ices.c
    team/oej/mp3/apps/app_image.c
    team/oej/mp3/apps/app_ivrdemo.c
    team/oej/mp3/apps/app_lookupblacklist.c
    team/oej/mp3/apps/app_lookupcidname.c
    team/oej/mp3/apps/app_macro.c
    team/oej/mp3/apps/app_meetme.c
    team/oej/mp3/apps/app_milliwatt.c
    team/oej/mp3/apps/app_mixmonitor.c
    team/oej/mp3/apps/app_morsecode.c
    team/oej/mp3/apps/app_mp3.c
    team/oej/mp3/apps/app_nbscat.c
    team/oej/mp3/apps/app_osplookup.c
    team/oej/mp3/apps/app_page.c
    team/oej/mp3/apps/app_parkandannounce.c
    team/oej/mp3/apps/app_playback.c
    team/oej/mp3/apps/app_privacy.c
    team/oej/mp3/apps/app_queue.c
    team/oej/mp3/apps/app_random.c
    team/oej/mp3/apps/app_read.c
    team/oej/mp3/apps/app_readfile.c
    team/oej/mp3/apps/app_realtime.c
    team/oej/mp3/apps/app_record.c
    team/oej/mp3/apps/app_rpt.c
    team/oej/mp3/apps/app_sayunixtime.c
    team/oej/mp3/apps/app_senddtmf.c
    team/oej/mp3/apps/app_sendtext.c
    team/oej/mp3/apps/app_setcallerid.c
    team/oej/mp3/apps/app_setcdruserfield.c
    team/oej/mp3/apps/app_settransfercapability.c
    team/oej/mp3/apps/app_skel.c
    team/oej/mp3/apps/app_sms.c
    team/oej/mp3/apps/app_softhangup.c
    team/oej/mp3/apps/app_speech_utils.c
    team/oej/mp3/apps/app_stack.c
    team/oej/mp3/apps/app_system.c
    team/oej/mp3/apps/app_talkdetect.c
    team/oej/mp3/apps/app_test.c
    team/oej/mp3/apps/app_transfer.c
    team/oej/mp3/apps/app_url.c
    team/oej/mp3/apps/app_userevent.c
    team/oej/mp3/apps/app_verbose.c
    team/oej/mp3/apps/app_voicemail.c
    team/oej/mp3/apps/app_waitforring.c
    team/oej/mp3/apps/app_waitforsilence.c
    team/oej/mp3/apps/app_while.c
    team/oej/mp3/apps/app_zapateller.c
    team/oej/mp3/apps/app_zapbarge.c
    team/oej/mp3/apps/app_zapras.c
    team/oej/mp3/apps/app_zapscan.c
    team/oej/mp3/build_tools/cflags.xml
    team/oej/mp3/build_tools/make_version
    team/oej/mp3/build_tools/menuselect-deps.in
    team/oej/mp3/build_tools/mkpkgconfig
    team/oej/mp3/build_tools/prep_moduledeps
    team/oej/mp3/cdr/   (props changed)
    team/oej/mp3/cdr/Makefile
    team/oej/mp3/cdr/cdr_csv.c
    team/oej/mp3/cdr/cdr_custom.c
    team/oej/mp3/cdr/cdr_manager.c
    team/oej/mp3/cdr/cdr_odbc.c
    team/oej/mp3/cdr/cdr_pgsql.c
    team/oej/mp3/cdr/cdr_radius.c
    team/oej/mp3/cdr/cdr_sqlite.c
    team/oej/mp3/cdr/cdr_tds.c
    team/oej/mp3/channels/   (props changed)
    team/oej/mp3/channels/Makefile
    team/oej/mp3/channels/chan_agent.c
    team/oej/mp3/channels/chan_alsa.c
    team/oej/mp3/channels/chan_features.c
    team/oej/mp3/channels/chan_h323.c
    team/oej/mp3/channels/chan_iax2.c
    team/oej/mp3/channels/chan_jingle.c
    team/oej/mp3/channels/chan_local.c
    team/oej/mp3/channels/chan_mgcp.c
    team/oej/mp3/channels/chan_misdn.c
    team/oej/mp3/channels/chan_nbs.c
    team/oej/mp3/channels/chan_oss.c
    team/oej/mp3/channels/chan_phone.c
    team/oej/mp3/channels/chan_sip.c
    team/oej/mp3/channels/chan_skinny.c
    team/oej/mp3/channels/chan_zap.c
    team/oej/mp3/channels/h323/Makefile
    team/oej/mp3/channels/misdn/Makefile
    team/oej/mp3/channels/misdn/ie.c
    team/oej/mp3/channels/misdn/isdn_lib.c
    team/oej/mp3/channels/misdn/isdn_lib.h
    team/oej/mp3/channels/misdn/isdn_lib_intern.h
    team/oej/mp3/channels/misdn/isdn_msg_parser.c
    team/oej/mp3/codecs/   (props changed)
    team/oej/mp3/codecs/Makefile
    team/oej/mp3/codecs/codec_a_mu.c
    team/oej/mp3/codecs/codec_adpcm.c
    team/oej/mp3/codecs/codec_alaw.c
    team/oej/mp3/codecs/codec_g726.c
    team/oej/mp3/codecs/codec_gsm.c
    team/oej/mp3/codecs/codec_ilbc.c
    team/oej/mp3/codecs/codec_lpc10.c
    team/oej/mp3/codecs/codec_speex.c
    team/oej/mp3/codecs/codec_ulaw.c
    team/oej/mp3/codecs/codec_zap.c
    team/oej/mp3/codecs/gsm/Makefile
    team/oej/mp3/configs/zapata.conf.sample
    team/oej/mp3/configure
    team/oej/mp3/configure.ac
    team/oej/mp3/contrib/asterisk-ng-doxygen
    team/oej/mp3/doc/queues-with-callback-members.txt
    team/oej/mp3/doc/speechrec.txt
    team/oej/mp3/formats/   (props changed)
    team/oej/mp3/formats/Makefile
    team/oej/mp3/formats/format_g723.c
    team/oej/mp3/formats/format_g726.c
    team/oej/mp3/formats/format_g729.c
    team/oej/mp3/formats/format_gsm.c
    team/oej/mp3/formats/format_h263.c
    team/oej/mp3/formats/format_h264.c
    team/oej/mp3/formats/format_ilbc.c
    team/oej/mp3/formats/format_jpeg.c
    team/oej/mp3/formats/format_ogg_vorbis.c
    team/oej/mp3/formats/format_pcm.c
    team/oej/mp3/formats/format_sln.c
    team/oej/mp3/formats/format_vox.c
    team/oej/mp3/formats/format_wav.c
    team/oej/mp3/formats/format_wav_gsm.c
    team/oej/mp3/funcs/   (props changed)
    team/oej/mp3/funcs/Makefile
    team/oej/mp3/funcs/func_base64.c
    team/oej/mp3/funcs/func_callerid.c
    team/oej/mp3/funcs/func_cdr.c
    team/oej/mp3/funcs/func_channel.c
    team/oej/mp3/funcs/func_curl.c
    team/oej/mp3/funcs/func_cut.c
    team/oej/mp3/funcs/func_db.c
    team/oej/mp3/funcs/func_enum.c
    team/oej/mp3/funcs/func_env.c
    team/oej/mp3/funcs/func_global.c
    team/oej/mp3/funcs/func_groupcount.c
    team/oej/mp3/funcs/func_language.c
    team/oej/mp3/funcs/func_logic.c
    team/oej/mp3/funcs/func_math.c
    team/oej/mp3/funcs/func_md5.c
    team/oej/mp3/funcs/func_moh.c
    team/oej/mp3/funcs/func_odbc.c
    team/oej/mp3/funcs/func_rand.c
    team/oej/mp3/funcs/func_realtime.c
    team/oej/mp3/funcs/func_sha1.c
    team/oej/mp3/funcs/func_strings.c
    team/oej/mp3/funcs/func_timeout.c
    team/oej/mp3/funcs/func_uri.c
    team/oej/mp3/include/asterisk.h
    team/oej/mp3/include/asterisk/abstract_jb.h
    team/oej/mp3/include/asterisk/autoconfig.h.in
    team/oej/mp3/include/asterisk/cdr.h
    team/oej/mp3/include/asterisk/compiler.h
    team/oej/mp3/include/asterisk/dns.h
    team/oej/mp3/include/asterisk/file.h
    team/oej/mp3/include/asterisk/indications.h
    team/oej/mp3/include/asterisk/linkedlists.h
    team/oej/mp3/include/asterisk/lock.h
    team/oej/mp3/include/asterisk/module.h
    team/oej/mp3/include/asterisk/monitor.h
    team/oej/mp3/include/asterisk/srv.h
    team/oej/mp3/include/asterisk/translate.h
    team/oej/mp3/include/asterisk/utils.h
    team/oej/mp3/makeopts.in
    team/oej/mp3/pbx/   (props changed)
    team/oej/mp3/pbx/Makefile
    team/oej/mp3/pbx/pbx_ael.c
    team/oej/mp3/pbx/pbx_config.c
    team/oej/mp3/pbx/pbx_dundi.c
    team/oej/mp3/pbx/pbx_loopback.c
    team/oej/mp3/pbx/pbx_realtime.c
    team/oej/mp3/pbx/pbx_spool.c
    team/oej/mp3/res/   (props changed)
    team/oej/mp3/res/Makefile
    team/oej/mp3/res/res_adsi.c
    team/oej/mp3/res/res_agi.c
    team/oej/mp3/res/res_clioriginate.c
    team/oej/mp3/res/res_config_odbc.c
    team/oej/mp3/res/res_config_pgsql.c
    team/oej/mp3/res/res_convert.c
    team/oej/mp3/res/res_crypto.c
    team/oej/mp3/res/res_features.c
    team/oej/mp3/res/res_indications.c
    team/oej/mp3/res/res_jabber.c
    team/oej/mp3/res/res_monitor.c
    team/oej/mp3/res/res_musiconhold.c
    team/oej/mp3/res/res_odbc.c
    team/oej/mp3/res/res_smdi.c
    team/oej/mp3/res/res_snmp.c
    team/oej/mp3/res/res_speech.c
    team/oej/mp3/sounds/Makefile
    team/oej/mp3/utils/   (props changed)
    team/oej/mp3/utils/Makefile
    team/oej/mp3/utils/ael_main.c

Propchange: team/oej/mp3/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/mp3/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/mp3/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/mp3/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Aug 24 14:57:07 2006
@@ -1,2 +1,1 @@
-menuselect	http://svn.digium.com/svn/menuselect/trunk
-mxml		http://svn.digium.com/svn/mxml/trunk
+menuselect	http://svn.digium.com/svn/menuselect/branches/1.0

Propchange: team/oej/mp3/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 24 14:57:07 2006
@@ -19,6 +19,6 @@
 menuselect.makedeps
 config.status
 config.log
-makeopts.xml
+menuselect-tree
 autom4te.cache
-muted
+makeopts.embed_rules

Propchange: team/oej/mp3/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 24 14:57:07 2006
@@ -1,1 +1,1 @@
-/trunk:1-40714
+/trunk:1-40994

Modified: team/oej/mp3/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/mp3/.cleancount?rev=40996&r1=40995&r2=40996&view=diff
==============================================================================
--- team/oej/mp3/.cleancount (original)
+++ team/oej/mp3/.cleancount Thu Aug 24 14:57:07 2006
@@ -1,1 +1,1 @@
-21
+22

Modified: team/oej/mp3/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/mp3/Makefile?rev=40996&r1=40995&r2=40996&view=diff
==============================================================================
--- team/oej/mp3/Makefile (original)
+++ team/oej/mp3/Makefile Thu Aug 24 14:57:07 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 -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include
+endif
 
 ASTERISKVERSION:=$(shell build_tools/make_version .)
 
@@ -283,93 +195,34 @@
 
 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
-SUBDIRS:=$(MOD_SUBDIRS) $(OTHER_SUBDIRS)
+SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_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 \
-	translate.o file.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 udptl.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 \
-	cryptostub.o sha1.o http.o fixedjitterbuf.o abstract_jb.o
-
-# we need to link in the objects statically, not as a library, because
-# otherwise modules will not have them available if none of the static
-# objects use it.
-OBJS+=stdtime/localtime.o
-
-# At the moment say.o is an optional component which can be overridden
-# by a module.
-OBJS+=say.o
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sys/poll.h),)
-  OBJS+= poll.o
-  ASTCFLAGS+=-DPOLLCOMPAT
-endif
-
-ifeq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/dlfcn.h),)
-  OBJS+= dlfcn.o

[... 22157 lines stripped ...]

More information about the asterisk-commits mailing list