[svn-commits] file: branch file/p2prtpbridging r40807 - in /team/file/p2prtpbridging: ./ ap...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Mon Aug 21 16:21:14 MST 2006 

Author: file
Date: Mon Aug 21 18:21:13 2006
New Revision: 40807

URL: http://svn.digium.com/view/asterisk?rev=40807&view=rev
Log:
Merged revisions 40599-40600,40602,40632,40663,40693,40722,40724-40726,40728,40751,40753,40757,40761,40765,40769-40770,40775,40780-40785,40789-40792,40796,40799 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r40599 | file | 2006-08-20 00:25:28 -0400 (Sun, 20 Aug 2006) | 2 lines

Properly check to see if parkingnum is a number (issue #7762 reported by robf)

................
r40600 | qwell | 2006-08-20 00:39:57 -0400 (Sun, 20 Aug 2006) | 4 lines

Converted device2str and control2str to use thread local storage.

Thanks Russell.

................
r40602 | file | 2006-08-20 00:51:06 -0400 (Sun, 20 Aug 2006) | 9 lines

Blocked revisions 40601 via svnmerge

........
r40601 | file | 2006-08-20 00:49:48 -0400 (Sun, 20 Aug 2006) | 2 lines

Turn media level c= parsing on by default (issue #7725 reported by psm)

........

................
r40632 | tilghman | 2006-08-20 11:46:00 -0400 (Sun, 20 Aug 2006) | 2 lines

Convert func_odbc to use the prepare_and_execute callback, which helps with a database reconnection issue (bug 7693)

................
r40663 | qwell | 2006-08-20 14:03:24 -0400 (Sun, 20 Aug 2006) | 2 lines

This is just step 1 in taking over the world.

................
r40693 | tilghman | 2006-08-20 18:12:50 -0400 (Sun, 20 Aug 2006) | 10 lines

Merged revisions 40692 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r40692 | tilghman | 2006-08-20 17:09:57 -0500 (Sun, 20 Aug 2006) | 2 lines

Reformat to match the contribution style of other contributors

........

................
r40722 | kpfleming | 2006-08-20 22:11:39 -0400 (Sun, 20 Aug 2006) | 8 lines

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)


................
r40724 | kpfleming | 2006-08-20 22:26:51 -0400 (Sun, 20 Aug 2006) | 2 lines

oops... no pattern rules for bison/flex

................
r40725 | kpfleming | 2006-08-20 22:31:01 -0400 (Sun, 20 Aug 2006) | 2 lines

main subdirectory is not dependencies for menuselect input

................
r40726 | kpfleming | 2006-08-20 22:46:47 -0400 (Sun, 20 Aug 2006) | 2 lines

could have sworn i committed this change already...

................
r40728 | kpfleming | 2006-08-20 22:54:05 -0400 (Sun, 20 Aug 2006) | 2 lines

document Makefile target changes

................
r40751 | kpfleming | 2006-08-20 23:06:41 -0400 (Sun, 20 Aug 2006) | 2 lines

don't declare these variables unless needed

................
r40753 | kpfleming | 2006-08-20 23:58:02 -0400 (Sun, 20 Aug 2006) | 2 lines

ensure that 'make' after 'svn update' that includes a configure script change won't run without making the user run configure first

................
r40757 | qwell | 2006-08-21 03:34:59 -0400 (Mon, 21 Aug 2006) | 5 lines

Fix a potential integer signedness problem.
Also fix some locking issues I found at the same time.

Issue 7770, original patch by alamantia

................
r40761 | kpfleming | 2006-08-21 07:48:08 -0400 (Mon, 21 Aug 2006) | 2 lines

swap module macro arguments to proper order

................
r40765 | kpfleming | 2006-08-21 09:47:45 -0400 (Mon, 21 Aug 2006) | 2 lines

replace a couple of bare 'make' with $(MAKE)

................
r40769 | kpfleming | 2006-08-21 10:42:03 -0400 (Mon, 21 Aug 2006) | 2 lines

use a safer process for checking if a module wants to export symbols into the global namespace

................
r40770 | kpfleming | 2006-08-21 10:45:58 -0400 (Mon, 21 Aug 2006) | 2 lines

build muted by default, since there is no Makefile target for it anymore

................
r40775 | russell | 2006-08-21 13:22:24 -0400 (Mon, 21 Aug 2006) | 5 lines

- use a common error message in all of the memory allocation macros
- add ast_asprintf() and ast_vasprintf()
- tweak doxygen comments
- simplify the definition of a flag macro

................
r40780 | russell | 2006-08-21 15:18:09 -0400 (Mon, 21 Aug 2006) | 9 lines

various cleanups, including ...
- Create an astmm_log() macro that logs the same message to both stderr as well
  as the mmlog file if it is open instead of duplicating the code everywhere.
- Use for loops for list traversals instead of while loops
- reduce nesting
- ensure locking isn't put around more than is necessary
- localize a struct definition
- change the limit of the path to the mmlog to PATH_MAX instead of 80

................
r40781 | file | 2006-08-21 15:33:42 -0400 (Mon, 21 Aug 2006) | 2 lines

Allow an offset for SIP_HEADER so you can get more then 1 header of the same name if they exist. Why someone would want to grab something like Via headers from dialplan I don't exactly know, but okay. (issue #7563 reported by Corydon76)

................
r40782 | russell | 2006-08-21 15:35:28 -0400 (Mon, 21 Aug 2006) | 5 lines

- use the atomic operations for incrementing the unique int
- free the string fields allocation if ast_create_channel() failes to open the
  alert pipe
- formatting tweaks

................
r40783 | russell | 2006-08-21 15:42:29 -0400 (Mon, 21 Aug 2006) | 9 lines

- simplify and improve astmm by using thread storage instead of a dynamic
  allocation and free on every call of the function for preparing the string
  that will be appended.  Then, use the ast_dynamic_str() code instead of the
  open coded version that is appended to when waiting for it to be delivered.
- use for loops for list traversals
- convert the manager sessions list to use list macros
- use atomic operations for num_sessions and usecounts
- convert some defines to the equivalent enum

................
r40784 | kpfleming | 2006-08-21 15:56:30 -0400 (Mon, 21 Aug 2006) | 2 lines

restore printing of module name during loading

................
r40785 | kpfleming | 2006-08-21 15:56:45 -0400 (Mon, 21 Aug 2006) | 2 lines

use new configure-provided wrappers for attributes

................
r40789 | kpfleming | 2006-08-21 16:04:59 -0400 (Mon, 21 Aug 2006) | 2 lines

don't initialize global variables list twice

................
r40790 | kpfleming | 2006-08-21 16:12:18 -0400 (Mon, 21 Aug 2006) | 3 lines

use a customized configure macro to tell the script that uCLinux does not have fork() that works
drop all startup options and code related to forking if it is not available

................
r40791 | kpfleming | 2006-08-21 16:18:36 -0400 (Mon, 21 Aug 2006) | 2 lines

another variable to clear out before configuring mxml

................
r40792 | kpfleming | 2006-08-21 16:19:47 -0400 (Mon, 21 Aug 2006) | 2 lines

oops... missed one

................
r40796 | kpfleming | 2006-08-21 18:23:26 -0400 (Mon, 21 Aug 2006) | 2 lines

restore 'preload' functionality in loader

................
r40799 | mogorman | 2006-08-21 18:36:15 -0400 (Mon, 21 Aug 2006) | 12 lines

Merged revisions 40798 via svnmerge from 
https://svn.digium.com/svn/asterisk/branches/1.2

........
r40798 | mogorman | 2006-08-21 17:34:26 -0500 (Mon, 21 Aug 2006) | 4 lines

Move the load_modules call so that if a module needs
realtime support it will work, none do currently but a good
move none the less.

........

................

Added:
    team/file/p2prtpbridging/main/   (props changed)
      - copied from r40799, trunk/main/
    team/file/p2prtpbridging/main/db1-ast/   (props changed)
      - copied from r40799, trunk/main/db1-ast/
    team/file/p2prtpbridging/main/db1-ast/btree/
      - copied from r40799, trunk/main/db1-ast/btree/
    team/file/p2prtpbridging/main/db1-ast/db/
      - copied from r40799, trunk/main/db1-ast/db/
    team/file/p2prtpbridging/main/db1-ast/hash/
      - copied from r40799, trunk/main/db1-ast/hash/
    team/file/p2prtpbridging/main/db1-ast/include/
      - copied from r40799, trunk/main/db1-ast/include/
    team/file/p2prtpbridging/main/db1-ast/mpool/
      - copied from r40799, trunk/main/db1-ast/mpool/
    team/file/p2prtpbridging/main/db1-ast/recno/
      - copied from r40799, trunk/main/db1-ast/recno/
    team/file/p2prtpbridging/main/editline/   (props changed)
      - copied from r40799, trunk/main/editline/
    team/file/p2prtpbridging/main/editline/TEST/
      - copied from r40799, trunk/main/editline/TEST/
    team/file/p2prtpbridging/main/editline/np/   (props changed)
      - copied from r40799, trunk/main/editline/np/
    team/file/p2prtpbridging/main/editline/readline/
      - copied from r40799, trunk/main/editline/readline/
    team/file/p2prtpbridging/main/stdtime/   (props changed)
      - copied from r40799, trunk/main/stdtime/
Removed:
    team/file/p2prtpbridging/abstract_jb.c
    team/file/p2prtpbridging/acl.c
    team/file/p2prtpbridging/aescrypt.c
    team/file/p2prtpbridging/aeskey.c
    team/file/p2prtpbridging/aesopt.h
    team/file/p2prtpbridging/aestab.c
    team/file/p2prtpbridging/alaw.c
    team/file/p2prtpbridging/app.c
    team/file/p2prtpbridging/ast_expr2.c
    team/file/p2prtpbridging/ast_expr2.fl
    team/file/p2prtpbridging/ast_expr2.h
    team/file/p2prtpbridging/ast_expr2.y
    team/file/p2prtpbridging/ast_expr2f.c
    team/file/p2prtpbridging/asterisk.8
    team/file/p2prtpbridging/asterisk.c
    team/file/p2prtpbridging/asterisk.sgml
    team/file/p2prtpbridging/astmm.c
    team/file/p2prtpbridging/autoservice.c
    team/file/p2prtpbridging/buildinfo.c
    team/file/p2prtpbridging/callerid.c
    team/file/p2prtpbridging/cdr.c
    team/file/p2prtpbridging/channel.c
    team/file/p2prtpbridging/chanvars.c
    team/file/p2prtpbridging/cli.c
    team/file/p2prtpbridging/coef_in.h
    team/file/p2prtpbridging/coef_out.h
    team/file/p2prtpbridging/config.c
    team/file/p2prtpbridging/cryptostub.c
    team/file/p2prtpbridging/cygwin/
    team/file/p2prtpbridging/db.c
    team/file/p2prtpbridging/db1-ast/
    team/file/p2prtpbridging/devicestate.c
    team/file/p2prtpbridging/dlfcn.c
    team/file/p2prtpbridging/dns.c
    team/file/p2prtpbridging/dnsmgr.c
    team/file/p2prtpbridging/dsp.c
    team/file/p2prtpbridging/ecdisa.h
    team/file/p2prtpbridging/editline/
    team/file/p2prtpbridging/enum.c
    team/file/p2prtpbridging/file.c
    team/file/p2prtpbridging/fixedjitterbuf.c
    team/file/p2prtpbridging/fixedjitterbuf.h
    team/file/p2prtpbridging/frame.c
    team/file/p2prtpbridging/fskmodem.c
    team/file/p2prtpbridging/http.c
    team/file/p2prtpbridging/image.c
    team/file/p2prtpbridging/indications.c
    team/file/p2prtpbridging/io.c
    team/file/p2prtpbridging/jitterbuf.c
    team/file/p2prtpbridging/jitterbuf.h
    team/file/p2prtpbridging/loader.c
    team/file/p2prtpbridging/logger.c
    team/file/p2prtpbridging/manager.c
    team/file/p2prtpbridging/md5.c
    team/file/p2prtpbridging/muted.c
    team/file/p2prtpbridging/netsock.c
    team/file/p2prtpbridging/pbx.c
    team/file/p2prtpbridging/plc.c
    team/file/p2prtpbridging/poll.c
    team/file/p2prtpbridging/privacy.c
    team/file/p2prtpbridging/rtp.c
    team/file/p2prtpbridging/say.c
    team/file/p2prtpbridging/sched.c
    team/file/p2prtpbridging/sha1.c
    team/file/p2prtpbridging/slinfactory.c
    team/file/p2prtpbridging/sounds.txt
    team/file/p2prtpbridging/srv.c
    team/file/p2prtpbridging/stdtime/
    team/file/p2prtpbridging/strcompat.c
    team/file/p2prtpbridging/tdd.c
    team/file/p2prtpbridging/term.c
    team/file/p2prtpbridging/translate.c
    team/file/p2prtpbridging/udptl.c
    team/file/p2prtpbridging/ulaw.c
    team/file/p2prtpbridging/utils.c
Modified:
    team/file/p2prtpbridging/   (props changed)
    team/file/p2prtpbridging/.cleancount
    team/file/p2prtpbridging/CREDITS
    team/file/p2prtpbridging/Makefile
    team/file/p2prtpbridging/Makefile.moddir_rules
    team/file/p2prtpbridging/Makefile.rules
    team/file/p2prtpbridging/UPGRADE.txt
    team/file/p2prtpbridging/acinclude.m4
    team/file/p2prtpbridging/apps/   (props changed)
    team/file/p2prtpbridging/apps/Makefile
    team/file/p2prtpbridging/apps/app_adsiprog.c
    team/file/p2prtpbridging/apps/app_alarmreceiver.c
    team/file/p2prtpbridging/apps/app_amd.c
    team/file/p2prtpbridging/apps/app_authenticate.c
    team/file/p2prtpbridging/apps/app_cdr.c
    team/file/p2prtpbridging/apps/app_chanisavail.c
    team/file/p2prtpbridging/apps/app_channelredirect.c
    team/file/p2prtpbridging/apps/app_chanspy.c
    team/file/p2prtpbridging/apps/app_controlplayback.c
    team/file/p2prtpbridging/apps/app_db.c
    team/file/p2prtpbridging/apps/app_dial.c
    team/file/p2prtpbridging/apps/app_dictate.c
    team/file/p2prtpbridging/apps/app_directed_pickup.c
    team/file/p2prtpbridging/apps/app_directory.c
    team/file/p2prtpbridging/apps/app_disa.c
    team/file/p2prtpbridging/apps/app_dumpchan.c
    team/file/p2prtpbridging/apps/app_echo.c
    team/file/p2prtpbridging/apps/app_exec.c
    team/file/p2prtpbridging/apps/app_externalivr.c
    team/file/p2prtpbridging/apps/app_festival.c
    team/file/p2prtpbridging/apps/app_flash.c
    team/file/p2prtpbridging/apps/app_followme.c
    team/file/p2prtpbridging/apps/app_forkcdr.c
    team/file/p2prtpbridging/apps/app_getcpeid.c
    team/file/p2prtpbridging/apps/app_hasnewvoicemail.c
    team/file/p2prtpbridging/apps/app_ices.c
    team/file/p2prtpbridging/apps/app_image.c
    team/file/p2prtpbridging/apps/app_ivrdemo.c
    team/file/p2prtpbridging/apps/app_lookupblacklist.c
    team/file/p2prtpbridging/apps/app_lookupcidname.c
    team/file/p2prtpbridging/apps/app_macro.c
    team/file/p2prtpbridging/apps/app_meetme.c
    team/file/p2prtpbridging/apps/app_milliwatt.c
    team/file/p2prtpbridging/apps/app_mixmonitor.c
    team/file/p2prtpbridging/apps/app_morsecode.c
    team/file/p2prtpbridging/apps/app_mp3.c
    team/file/p2prtpbridging/apps/app_nbscat.c
    team/file/p2prtpbridging/apps/app_osplookup.c
    team/file/p2prtpbridging/apps/app_page.c
    team/file/p2prtpbridging/apps/app_parkandannounce.c
    team/file/p2prtpbridging/apps/app_playback.c
    team/file/p2prtpbridging/apps/app_privacy.c
    team/file/p2prtpbridging/apps/app_queue.c
    team/file/p2prtpbridging/apps/app_random.c
    team/file/p2prtpbridging/apps/app_read.c
    team/file/p2prtpbridging/apps/app_readfile.c
    team/file/p2prtpbridging/apps/app_realtime.c
    team/file/p2prtpbridging/apps/app_record.c
    team/file/p2prtpbridging/apps/app_rpt.c
    team/file/p2prtpbridging/apps/app_sayunixtime.c
    team/file/p2prtpbridging/apps/app_senddtmf.c
    team/file/p2prtpbridging/apps/app_sendtext.c
    team/file/p2prtpbridging/apps/app_setcallerid.c
    team/file/p2prtpbridging/apps/app_setcdruserfield.c
    team/file/p2prtpbridging/apps/app_settransfercapability.c
    team/file/p2prtpbridging/apps/app_skel.c
    team/file/p2prtpbridging/apps/app_sms.c
    team/file/p2prtpbridging/apps/app_softhangup.c
    team/file/p2prtpbridging/apps/app_speech_utils.c
    team/file/p2prtpbridging/apps/app_stack.c
    team/file/p2prtpbridging/apps/app_system.c
    team/file/p2prtpbridging/apps/app_talkdetect.c
    team/file/p2prtpbridging/apps/app_test.c
    team/file/p2prtpbridging/apps/app_transfer.c
    team/file/p2prtpbridging/apps/app_url.c
    team/file/p2prtpbridging/apps/app_userevent.c
    team/file/p2prtpbridging/apps/app_verbose.c
    team/file/p2prtpbridging/apps/app_voicemail.c
    team/file/p2prtpbridging/apps/app_waitforring.c
    team/file/p2prtpbridging/apps/app_waitforsilence.c
    team/file/p2prtpbridging/apps/app_while.c
    team/file/p2prtpbridging/apps/app_zapateller.c
    team/file/p2prtpbridging/apps/app_zapbarge.c
    team/file/p2prtpbridging/apps/app_zapras.c
    team/file/p2prtpbridging/apps/app_zapscan.c
    team/file/p2prtpbridging/build_tools/cflags.xml
    team/file/p2prtpbridging/build_tools/menuselect-deps.in
    team/file/p2prtpbridging/build_tools/prep_moduledeps
    team/file/p2prtpbridging/cdr/   (props changed)
    team/file/p2prtpbridging/cdr/Makefile
    team/file/p2prtpbridging/cdr/cdr_csv.c
    team/file/p2prtpbridging/cdr/cdr_custom.c
    team/file/p2prtpbridging/cdr/cdr_manager.c
    team/file/p2prtpbridging/cdr/cdr_odbc.c
    team/file/p2prtpbridging/cdr/cdr_pgsql.c
    team/file/p2prtpbridging/cdr/cdr_radius.c
    team/file/p2prtpbridging/cdr/cdr_sqlite.c
    team/file/p2prtpbridging/cdr/cdr_tds.c
    team/file/p2prtpbridging/channels/   (props changed)
    team/file/p2prtpbridging/channels/Makefile
    team/file/p2prtpbridging/channels/chan_agent.c
    team/file/p2prtpbridging/channels/chan_alsa.c
    team/file/p2prtpbridging/channels/chan_features.c
    team/file/p2prtpbridging/channels/chan_h323.c
    team/file/p2prtpbridging/channels/chan_iax2.c
    team/file/p2prtpbridging/channels/chan_jingle.c
    team/file/p2prtpbridging/channels/chan_local.c
    team/file/p2prtpbridging/channels/chan_mgcp.c
    team/file/p2prtpbridging/channels/chan_misdn.c
    team/file/p2prtpbridging/channels/chan_nbs.c
    team/file/p2prtpbridging/channels/chan_oss.c
    team/file/p2prtpbridging/channels/chan_phone.c
    team/file/p2prtpbridging/channels/chan_sip.c
    team/file/p2prtpbridging/channels/chan_skinny.c
    team/file/p2prtpbridging/channels/chan_zap.c
    team/file/p2prtpbridging/channels/h323/Makefile
    team/file/p2prtpbridging/channels/misdn/Makefile
    team/file/p2prtpbridging/channels/misdn/ie.c
    team/file/p2prtpbridging/channels/misdn/isdn_lib.c
    team/file/p2prtpbridging/channels/misdn/isdn_lib.h
    team/file/p2prtpbridging/channels/misdn/isdn_lib_intern.h
    team/file/p2prtpbridging/channels/misdn/isdn_msg_parser.c
    team/file/p2prtpbridging/codecs/   (props changed)
    team/file/p2prtpbridging/codecs/Makefile
    team/file/p2prtpbridging/codecs/codec_a_mu.c
    team/file/p2prtpbridging/codecs/codec_adpcm.c
    team/file/p2prtpbridging/codecs/codec_alaw.c
    team/file/p2prtpbridging/codecs/codec_g726.c
    team/file/p2prtpbridging/codecs/codec_gsm.c
    team/file/p2prtpbridging/codecs/codec_ilbc.c
    team/file/p2prtpbridging/codecs/codec_lpc10.c
    team/file/p2prtpbridging/codecs/codec_speex.c
    team/file/p2prtpbridging/codecs/codec_ulaw.c
    team/file/p2prtpbridging/codecs/codec_zap.c
    team/file/p2prtpbridging/codecs/gsm/Makefile
    team/file/p2prtpbridging/configure
    team/file/p2prtpbridging/configure.ac
    team/file/p2prtpbridging/formats/   (props changed)
    team/file/p2prtpbridging/formats/Makefile
    team/file/p2prtpbridging/formats/format_g723.c
    team/file/p2prtpbridging/formats/format_g726.c
    team/file/p2prtpbridging/formats/format_g729.c
    team/file/p2prtpbridging/formats/format_gsm.c
    team/file/p2prtpbridging/formats/format_h263.c
    team/file/p2prtpbridging/formats/format_h264.c
    team/file/p2prtpbridging/formats/format_ilbc.c
    team/file/p2prtpbridging/formats/format_jpeg.c
    team/file/p2prtpbridging/formats/format_ogg_vorbis.c
    team/file/p2prtpbridging/formats/format_pcm.c
    team/file/p2prtpbridging/formats/format_sln.c
    team/file/p2prtpbridging/formats/format_vox.c
    team/file/p2prtpbridging/formats/format_wav.c
    team/file/p2prtpbridging/formats/format_wav_gsm.c
    team/file/p2prtpbridging/funcs/   (props changed)
    team/file/p2prtpbridging/funcs/Makefile
    team/file/p2prtpbridging/funcs/func_base64.c
    team/file/p2prtpbridging/funcs/func_callerid.c
    team/file/p2prtpbridging/funcs/func_cdr.c
    team/file/p2prtpbridging/funcs/func_channel.c
    team/file/p2prtpbridging/funcs/func_curl.c
    team/file/p2prtpbridging/funcs/func_cut.c
    team/file/p2prtpbridging/funcs/func_db.c
    team/file/p2prtpbridging/funcs/func_enum.c
    team/file/p2prtpbridging/funcs/func_env.c
    team/file/p2prtpbridging/funcs/func_global.c
    team/file/p2prtpbridging/funcs/func_groupcount.c
    team/file/p2prtpbridging/funcs/func_language.c
    team/file/p2prtpbridging/funcs/func_logic.c
    team/file/p2prtpbridging/funcs/func_math.c
    team/file/p2prtpbridging/funcs/func_md5.c
    team/file/p2prtpbridging/funcs/func_moh.c
    team/file/p2prtpbridging/funcs/func_odbc.c
    team/file/p2prtpbridging/funcs/func_rand.c
    team/file/p2prtpbridging/funcs/func_realtime.c
    team/file/p2prtpbridging/funcs/func_sha1.c
    team/file/p2prtpbridging/funcs/func_strings.c
    team/file/p2prtpbridging/funcs/func_timeout.c
    team/file/p2prtpbridging/funcs/func_uri.c
    team/file/p2prtpbridging/include/asterisk.h
    team/file/p2prtpbridging/include/asterisk/abstract_jb.h
    team/file/p2prtpbridging/include/asterisk/autoconfig.h.in
    team/file/p2prtpbridging/include/asterisk/cdr.h
    team/file/p2prtpbridging/include/asterisk/compiler.h
    team/file/p2prtpbridging/include/asterisk/dns.h
    team/file/p2prtpbridging/include/asterisk/file.h
    team/file/p2prtpbridging/include/asterisk/indications.h
    team/file/p2prtpbridging/include/asterisk/linkedlists.h
    team/file/p2prtpbridging/include/asterisk/lock.h
    team/file/p2prtpbridging/include/asterisk/module.h
    team/file/p2prtpbridging/include/asterisk/monitor.h
    team/file/p2prtpbridging/include/asterisk/srv.h
    team/file/p2prtpbridging/include/asterisk/translate.h
    team/file/p2prtpbridging/include/asterisk/utils.h
    team/file/p2prtpbridging/makeopts.in
    team/file/p2prtpbridging/pbx/   (props changed)
    team/file/p2prtpbridging/pbx/Makefile
    team/file/p2prtpbridging/pbx/pbx_ael.c
    team/file/p2prtpbridging/pbx/pbx_config.c
    team/file/p2prtpbridging/pbx/pbx_dundi.c
    team/file/p2prtpbridging/pbx/pbx_loopback.c
    team/file/p2prtpbridging/pbx/pbx_realtime.c
    team/file/p2prtpbridging/pbx/pbx_spool.c
    team/file/p2prtpbridging/res/   (props changed)
    team/file/p2prtpbridging/res/Makefile
    team/file/p2prtpbridging/res/res_adsi.c
    team/file/p2prtpbridging/res/res_agi.c
    team/file/p2prtpbridging/res/res_clioriginate.c
    team/file/p2prtpbridging/res/res_config_odbc.c
    team/file/p2prtpbridging/res/res_config_pgsql.c
    team/file/p2prtpbridging/res/res_convert.c
    team/file/p2prtpbridging/res/res_crypto.c
    team/file/p2prtpbridging/res/res_features.c
    team/file/p2prtpbridging/res/res_indications.c
    team/file/p2prtpbridging/res/res_jabber.c
    team/file/p2prtpbridging/res/res_monitor.c
    team/file/p2prtpbridging/res/res_musiconhold.c
    team/file/p2prtpbridging/res/res_odbc.c
    team/file/p2prtpbridging/res/res_smdi.c
    team/file/p2prtpbridging/res/res_snmp.c
    team/file/p2prtpbridging/res/res_speech.c
    team/file/p2prtpbridging/sounds/Makefile
    team/file/p2prtpbridging/utils/Makefile
    team/file/p2prtpbridging/utils/ael_main.c

Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
    automerge = paleez

Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Aug 21 18:21:13 2006
@@ -19,6 +19,7 @@
 menuselect.makedeps
 config.status
 config.log
-makeopts.xml
+menuselect-tree
 autom4te.cache
 muted
+makeopts.embed_rules

Propchange: team/file/p2prtpbridging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug 21 18:21:13 2006
@@ -1,1 +1,1 @@
-/trunk:1-40566
+/trunk:1-40806

Modified: team/file/p2prtpbridging/.cleancount
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/.cleancount?rev=40807&r1=40806&r2=40807&view=diff
==============================================================================
--- team/file/p2prtpbridging/.cleancount (original)
+++ team/file/p2prtpbridging/.cleancount Mon Aug 21 18:21:13 2006
@@ -1,1 +1,1 @@
-21
+22

Modified: team/file/p2prtpbridging/CREDITS
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/CREDITS?rev=40807&r1=40806&r2=40807&view=diff
==============================================================================
--- team/file/p2prtpbridging/CREDITS (original)
+++ team/file/p2prtpbridging/CREDITS Mon Aug 21 18:21:13 2006
@@ -41,39 +41,14 @@
 	russelb at clemson.edu
 
 Anthony Minessale II - Countless big and small fixes, and relentless forward push
-also:
-app_chanspy
-app_forkcdr
-app_controlplayback
-app_while
-app_dumpchan
-app_dictate
-app_realtime
-app_macroif
-app_execif
-app_execiftime
-res_odbc
-res_config_odbc
-format_slin
-app_retrydial
-cdr_custom
-res_muxmon (now MixMonitor)
-res_sqlite
-format_mp3
-Several Features in app_dial including L(), G() and enhancements to M() and D()
-The concept design and initial implementation of dialplan functions with several examples.
-Several CDR enhancements including CDR variables.
-Attended Transfer
-One Touch Record
-Native Music On Hold
-Pluggable config backend (res_config)
-Realtime Caching options and SIP/IAX clusterability
-IAX codec preferences
-Modifications to the manager API to disable events.
-command line '-t' flag to allow recording/voicemail on nfs shares.
-#exec parser in config files.
-setvar from iax and sip peers.
-mulit-line comments in config files.
+	ChanSpy, ForkCDR, ControlPlayback, While/EndWhile, DumpChan, Dictate,
+	MacroIf, ExecIf, ExecIfTime, RetryDial, MixMonitor applications; many realtime
+	concepts and implementation pieces, including res_config_odbc; format_slin;
+	cdr_custom; several features in Dial including L(), G() and enhancements to
+	M() and D(); several CDR enhancements including CDR variables; attended
+	transfer; one touch record; native MOH; manager eventmask; command line '-t'
+	flag to allow recording/voicemail on nfs shares; #exec command and multiline
+	comments in config files; setvar in iax and sip configs.
 	anthmct at yahoo.com              http://www.asterlink.com
 
 James Golovich - Innumerable contributions

Modified: team/file/p2prtpbridging/Makefile
URL: http://svn.digium.com/view/asterisk/team/file/p2prtpbridging/Makefile?rev=40807&r1=40806&r2=40807&view=diff
==============================================================================
--- team/file/p2prtpbridging/Makefile (original)
+++ team/file/p2prtpbridging/Makefile Mon Aug 21 18:21:13 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,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
-  ASTCFLAGS+=-DDLFCNCOMPAT
-endif
-
-ifeq ($(OSARCH),Linux)
-  AST_LIBS+=-ldl -lpthread $(EDITLINE_LIB) -lm -lresolv  #-lnjamd
-else
-  AST_LIBS+=$(EDITLINE_LIB) -lm
-endif
-
-ifeq ($(OSARCH),Darwin)
-  AST_LIBS+=-lresolv
+MOD_SUBDIRS_EMBED_LDSCRIPT:=$(MOD_SUBDIRS:%=%-embed-ldscript)
+MOD_SUBDIRS_EMBED_LDFLAGS:=$(MOD_SUBDIRS:%=%-embed-ldflags)
+MOD_SUBDIRS_EMBED_LIBS:=$(MOD_SUBDIRS:%=%-embed-libs)
+
+ifneq ($(findstring darwin,$(OSARCH)),)
   ASTCFLAGS+=-D__Darwin__
   AUDIO_LIBS=-framework CoreAudio
-  ASTLINK=-Wl,-dynamic
   SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
-  # Mac on Intel CoreDuo does not need poll compatibility layer
-  ifneq ($(PROC),i386)
-    OBJS+=poll.o
-    ASTCFLAGS+=-DPOLLCOMPAT
-  endif
 else
 # These are used for all but Darwin
-  ASTLINK=-Wl,-E 
   SOLINK=-shared -Xlinker -x
-  ifeq ($(findstring BSD,$(OSARCH)),BSD)
-    LDFLAGS+=-L$(CROSS_COMPILE_TARGET)/usr/local/lib
+  ifneq ($(findstring BSD,$(OSARCH)),)
+    LDFLAGS+=-L/usr/local/lib
   endif
 endif
 
-ifeq ($(OSARCH),FreeBSD)
-  AST_LIBS+=-lcrypto
-endif
-
-ifeq ($(OSARCH),NetBSD)
-  AST_LIBS+=-lpthread -lcrypto -lm -L$(CROSS_COMPILE_TARGET)/usr/pkg/lib $(EDITLINE_LIB)
-endif
-
-ifeq ($(OSARCH),OpenBSD)
-  AST_LIBS+=-lcrypto -lpthread -lm $(EDITLINE_LIB)
-endif
-
 ifeq ($(OSARCH),SunOS)
-  AST_LIBS+=-lpthread -ldl -lnsl -lsocket -lresolv -L$(CROSS_COMPILE_TARGET)/opt/ssl/lib -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
-  OBJS+=strcompat.o
-  ASTLINK=
-  SOLINK=-shared -fpic -L$(CROSS_COMPILE_TARGET)/usr/local/ssl/lib
-endif
-
-ifeq ($(MAKETOPLEVEL),$(MAKELEVEL))
-  CFLAGS+=$(TOPDIR_CFLAGS)$(ASTCFLAGS)
+  SOLINK=-shared -fpic -L/usr/local/ssl/lib
 endif
 
 # This is used when generating the doxygen documentation
@@ -379,9 +232,7 @@
   HAVEDOT=no
 endif
 
-include Makefile.rules
-
-_all: all
+all: cleantest $(SUBDIRS)
 	@echo " +--------- Asterisk Build Complete ---------+"  
 	@echo " + Asterisk has successfully been built, but +"  
 	@echo " + cannot be run before being installed by   +"  
@@ -390,94 +241,44 @@
 	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest config.status menuselect.makeopts depend $(SUBDIRS) asterisk
-
-$(MOD_SUBDIRS):
-	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
-
-$(OTHER_SUBDIRS):
-	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) -C $@
-
-config.status: configure
-	@CFLAGS="" ./configure
+makeopts: configure
 	@echo "****"
-	@echo "**** The configure script was just executed, so 'make' needs to be"
-	@echo "**** restarted."
+	@echo "**** The configure script must be executed before running 'make'."
 	@echo "****"
 	@exit 1
 
-makeopts: configure
-	@CFLAGS="" ./configure
-	@echo "****"
-	@echo "**** The configure script was just executed, so 'make' needs to be"
-	@echo "**** restarted."
-	@echo "****"
-	@exit 1
-
-menuselect.makeopts menuselect.makedeps: menuselect/menuselect menuselect-tree
+menuselect.makeopts: menuselect/menuselect menuselect-tree
 	menuselect/menuselect --check-deps $(GLOBAL_MAKEOPTS) $(USER_MAKEOPTS) menuselect.makeopts
 
-#ifneq ($(wildcard tags),)
-ctags: tags
-#endif
-
-ifneq ($(wildcard TAGS),)
-all: TAGS
-endif
-
-editline/config.h:
-	cd editline && unset CFLAGS AST_LIBS && CFLAGS="$(OPTIMIZE)" ./configure ; \
-
-editline/libedit.a:
-	cd editline && unset CFLAGS AST_LIBS && test -f config.h || CFLAGS="$(OPTIMIZE)" ./configure
-	$(MAKE) -C editline libedit.a
-
-db1-ast/libdb1.a:
-	$(MAKE) -C db1-ast libdb1.a
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard .depend),)
-  include .depend
- endif
-endif
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard .tags-depend),)
-  include .tags-depend
- endif
-endif
-
-ast_expr2.c ast_expr2.h:
-	bison -o $@ -d --name-prefix=ast_yy ast_expr2.y
-
-ast_expr2f.c:
-	flex -o $@ --full ast_expr2.fl
-
-testexpr2: config.status include/asterisk/buildopts.h ast_expr2f.c ast_expr2.c ast_expr2.h
-	$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2f.c
-	$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2.c
-	$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o
-	rm ast_expr2.o ast_expr2f.o 
-
-manpage: asterisk.8
-
-asterisk.8: asterisk.sgml
-	rm -f asterisk.8
-	docbook2man asterisk.sgml
-	mv ./*.8 asterisk.8
-
-asterisk.pdf: asterisk.sgml
-	docbook2pdf asterisk.sgml
-
-asterisk.ps: asterisk.sgml
-	docbook2ps asterisk.sgml
-
-asterisk.html: asterisk.sgml
-	docbook2html asterisk.sgml
-	mv r1.html asterisk.html
-
-asterisk.txt: asterisk.sgml
-	docbook2txt asterisk.sgml
+$(MOD_SUBDIRS_EMBED_LDSCRIPT):
+	@echo "EMBED_LDSCRIPTS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldscript=) SUBDIR=$(@:-embed-ldscript=) __embed_ldscript` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LDFLAGS):
+	@echo "EMBED_LDFLAGS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-ldflags=) SUBDIR=$(@:-embed-ldflags=) __embed_ldflags` >> makeopts.embed_rules
+
+$(MOD_SUBDIRS_EMBED_LIBS):
+	@echo "EMBED_LIBS+="`$(MAKE) --quiet --no-print-directory -C $(@:-embed-libs=) SUBDIR=$(@:-embed-libs=) __embed_libs` >> makeopts.embed_rules
+
+makeopts.embed_rules: menuselect.makeopts
+	@echo "Generating embedded module rules ..."
+	@rm -f $@
+	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDSCRIPT)
+	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LDFLAGS)
+	@$(MAKE) --no-print-directory $(MOD_SUBDIRS_EMBED_LIBS)
+
+$(SUBDIRS): depend makeopts.embed_rules
+
+# ensure that all module subdirectories are processed before 'main' during
+# a parallel build, since if there are modules selected to be embedded the
+# directories containing them must be completed before the main Asterisk
+# binary can be built
+main: $(filter-out main,$(MOD_SUBDIRS))
+
+$(MOD_SUBDIRS):
+	@CFLAGS="$(MOD_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
+
+$(OTHER_SUBDIRS):
+	@CFLAGS="$(OTHER_SUBDIR_CFLAGS)$(ASTCFLAGS)" $(MAKE) --no-print-directory -C $@ SUBDIR=$@ all
 
 defaults.h: makeopts
 	@build_tools/make_defaults_h > $@.tmp
@@ -500,39 +301,19 @@
 	fi
 	@rm -f $@.tmp
 
-channel.o: CFLAGS+=$(ZAPTEL_INCLUDE)
-
-asterisk: include/asterisk/buildopts.h editline/libedit.a db1-ast/libdb1.a $(OBJS)

[... 21938 lines stripped ...]

More information about the svn-commits mailing list