[asterisk-commits] branch group/ami_ssl r34089 - in /team/group/ami_ssl: ./ apps/ build_tools/ c...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Wed Jun 14 07:12:14 MST 2006 

Author: oej
Date: Wed Jun 14 09:12:11 2006
New Revision: 34089

URL: http://svn.digium.com/view/asterisk?rev=34089&view=rev
Log:
Reset automerge, resolve conflicts

Added:
    team/group/ami_ssl/abstract_jb.c
      - copied unchanged from r34065, trunk/abstract_jb.c
    team/group/ami_ssl/apps/app_followme.c
      - copied unchanged from r34065, trunk/apps/app_followme.c
    team/group/ami_ssl/channels/chan_jingle.c
      - copied unchanged from r34065, trunk/channels/chan_jingle.c
    team/group/ami_ssl/configs/followme.conf.sample
      - copied unchanged from r34065, trunk/configs/followme.conf.sample
    team/group/ami_ssl/configs/jabber.conf.sample
      - copied unchanged from r34065, trunk/configs/jabber.conf.sample
    team/group/ami_ssl/configs/jingle.conf.sample
      - copied unchanged from r34065, trunk/configs/jingle.conf.sample
    team/group/ami_ssl/contrib/utils/zones2indications.c
      - copied unchanged from r34065, trunk/contrib/utils/zones2indications.c
    team/group/ami_ssl/doc/callfiles.txt
      - copied unchanged from r34065, trunk/doc/callfiles.txt
    team/group/ami_ssl/doc/jabber.txt
      - copied unchanged from r34065, trunk/doc/jabber.txt
    team/group/ami_ssl/doc/jingle.txt
      - copied unchanged from r34065, trunk/doc/jingle.txt
    team/group/ami_ssl/fixedjitterbuf.c
      - copied unchanged from r34065, trunk/fixedjitterbuf.c
    team/group/ami_ssl/fixedjitterbuf.h
      - copied unchanged from r34065, trunk/fixedjitterbuf.h
    team/group/ami_ssl/funcs/func_global.c
      - copied unchanged from r34065, trunk/funcs/func_global.c
    team/group/ami_ssl/include/asterisk/abstract_jb.h
      - copied unchanged from r34065, trunk/include/asterisk/abstract_jb.h
    team/group/ami_ssl/include/asterisk/autoconfig.h.in
      - copied unchanged from r34065, trunk/include/asterisk/autoconfig.h.in
    team/group/ami_ssl/include/asterisk/jabber.h
      - copied unchanged from r34065, trunk/include/asterisk/jabber.h
    team/group/ami_ssl/include/asterisk/jingle.h
      - copied unchanged from r34065, trunk/include/asterisk/jingle.h
    team/group/ami_ssl/res/res_jabber.c
      - copied unchanged from r34065, trunk/res/res_jabber.c
    team/group/ami_ssl/sounds/Makefile
      - copied unchanged from r34065, trunk/sounds/Makefile
    team/group/ami_ssl/sounds/sounds.xml
      - copied unchanged from r34065, trunk/sounds/sounds.xml
Removed:
    team/group/ami_ssl/include/autoconfig.h.in
    team/group/ami_ssl/sounds/agent-alreadyon.gsm
    team/group/ami_ssl/sounds/agent-incorrect.gsm
    team/group/ami_ssl/sounds/agent-loggedoff.gsm
    team/group/ami_ssl/sounds/agent-loginok.gsm
    team/group/ami_ssl/sounds/agent-newlocation.gsm
    team/group/ami_ssl/sounds/agent-pass.gsm
    team/group/ami_ssl/sounds/agent-user.gsm
    team/group/ami_ssl/sounds/auth-incorrect.gsm
    team/group/ami_ssl/sounds/auth-thankyou.gsm
    team/group/ami_ssl/sounds/beep.gsm
    team/group/ami_ssl/sounds/beeperr.gsm
    team/group/ami_ssl/sounds/conf-adminmenu.gsm
    team/group/ami_ssl/sounds/conf-enteringno.gsm
    team/group/ami_ssl/sounds/conf-errormenu.gsm
    team/group/ami_ssl/sounds/conf-getchannel.gsm
    team/group/ami_ssl/sounds/conf-getconfno.gsm
    team/group/ami_ssl/sounds/conf-getpin.gsm
    team/group/ami_ssl/sounds/conf-hasjoin.gsm
    team/group/ami_ssl/sounds/conf-hasleft.gsm
    team/group/ami_ssl/sounds/conf-invalid.gsm
    team/group/ami_ssl/sounds/conf-invalidpin.gsm
    team/group/ami_ssl/sounds/conf-kicked.gsm
    team/group/ami_ssl/sounds/conf-leaderhasleft.gsm
    team/group/ami_ssl/sounds/conf-locked.gsm
    team/group/ami_ssl/sounds/conf-lockednow.gsm
    team/group/ami_ssl/sounds/conf-muted.gsm
    team/group/ami_ssl/sounds/conf-noempty.gsm
    team/group/ami_ssl/sounds/conf-onlyone.gsm
    team/group/ami_ssl/sounds/conf-onlyperson.gsm
    team/group/ami_ssl/sounds/conf-otherinparty.gsm
    team/group/ami_ssl/sounds/conf-placeintoconf.gsm
    team/group/ami_ssl/sounds/conf-thereare.gsm
    team/group/ami_ssl/sounds/conf-unlockednow.gsm
    team/group/ami_ssl/sounds/conf-unmuted.gsm
    team/group/ami_ssl/sounds/conf-usermenu.gsm
    team/group/ami_ssl/sounds/conf-userswilljoin.gsm
    team/group/ami_ssl/sounds/conf-userwilljoin.gsm
    team/group/ami_ssl/sounds/conf-waitforleader.gsm
    team/group/ami_ssl/sounds/demo-abouttotry.gsm
    team/group/ami_ssl/sounds/demo-congrats.gsm
    team/group/ami_ssl/sounds/demo-echodone.gsm
    team/group/ami_ssl/sounds/demo-echotest.gsm
    team/group/ami_ssl/sounds/demo-enterkeywords.gsm
    team/group/ami_ssl/sounds/demo-instruct.gsm
    team/group/ami_ssl/sounds/demo-moreinfo.gsm
    team/group/ami_ssl/sounds/demo-nogo.gsm
    team/group/ami_ssl/sounds/demo-nomatch.gsm
    team/group/ami_ssl/sounds/demo-thanks.gsm
    team/group/ami_ssl/sounds/dictate/
    team/group/ami_ssl/sounds/digits/
    team/group/ami_ssl/sounds/dir-instr.gsm
    team/group/ami_ssl/sounds/dir-intro-fn.gsm
    team/group/ami_ssl/sounds/dir-intro.gsm
    team/group/ami_ssl/sounds/dir-nomatch.gsm
    team/group/ami_ssl/sounds/dir-nomore.gsm
    team/group/ami_ssl/sounds/fpm-calm-river.mp3
    team/group/ami_ssl/sounds/fpm-sunshine.mp3
    team/group/ami_ssl/sounds/fpm-world-mix.mp3
    team/group/ami_ssl/sounds/hello-world.gsm
    team/group/ami_ssl/sounds/hours.gsm
    team/group/ami_ssl/sounds/invalid.gsm
    team/group/ami_ssl/sounds/letters/
    team/group/ami_ssl/sounds/minutes.gsm
    team/group/ami_ssl/sounds/pbx-invalid.gsm
    team/group/ami_ssl/sounds/pbx-invalidpark.gsm
    team/group/ami_ssl/sounds/pbx-transfer.gsm
    team/group/ami_ssl/sounds/phonetic/
    team/group/ami_ssl/sounds/priv-callee-options.gsm
    team/group/ami_ssl/sounds/priv-callpending.gsm
    team/group/ami_ssl/sounds/priv-introsaved.gsm
    team/group/ami_ssl/sounds/priv-recordintro.gsm
    team/group/ami_ssl/sounds/privacy-incorrect.gsm
    team/group/ami_ssl/sounds/privacy-prompt.gsm
    team/group/ami_ssl/sounds/privacy-thankyou.gsm
    team/group/ami_ssl/sounds/privacy-unident.gsm
    team/group/ami_ssl/sounds/queue-callswaiting.gsm
    team/group/ami_ssl/sounds/queue-holdtime.gsm
    team/group/ami_ssl/sounds/queue-less-than.gsm
    team/group/ami_ssl/sounds/queue-minutes.gsm
    team/group/ami_ssl/sounds/queue-periodic-announce.gsm
    team/group/ami_ssl/sounds/queue-reporthold.gsm
    team/group/ami_ssl/sounds/queue-seconds.gsm
    team/group/ami_ssl/sounds/queue-thankyou.gsm
    team/group/ami_ssl/sounds/queue-thereare.gsm
    team/group/ami_ssl/sounds/queue-youarenext.gsm
    team/group/ami_ssl/sounds/screen-callee-options.gsm
    team/group/ami_ssl/sounds/seconds.gsm
    team/group/ami_ssl/sounds/spy-agent.gsm
    team/group/ami_ssl/sounds/spy-h323.gsm
    team/group/ami_ssl/sounds/spy-iax.gsm
    team/group/ami_ssl/sounds/spy-iax2.gsm
    team/group/ami_ssl/sounds/spy-mgcp.gsm
    team/group/ami_ssl/sounds/spy-sip.gsm
    team/group/ami_ssl/sounds/spy-skinny.gsm
    team/group/ami_ssl/sounds/spy-zap.gsm
    team/group/ami_ssl/sounds/ss-noservice.gsm
    team/group/ami_ssl/sounds/transfer.gsm
    team/group/ami_ssl/sounds/tt-allbusy.gsm
    team/group/ami_ssl/sounds/tt-monkeys.gsm
    team/group/ami_ssl/sounds/tt-monkeysintro.gsm
    team/group/ami_ssl/sounds/tt-somethingwrong.gsm
    team/group/ami_ssl/sounds/tt-weasels.gsm
    team/group/ami_ssl/sounds/vm-Cust1.gsm
    team/group/ami_ssl/sounds/vm-Cust2.gsm
    team/group/ami_ssl/sounds/vm-Cust3.gsm
    team/group/ami_ssl/sounds/vm-Cust4.gsm
    team/group/ami_ssl/sounds/vm-Cust5.gsm
    team/group/ami_ssl/sounds/vm-Family.gsm
    team/group/ami_ssl/sounds/vm-Friends.gsm
    team/group/ami_ssl/sounds/vm-INBOX.gsm
    team/group/ami_ssl/sounds/vm-Old.gsm
    team/group/ami_ssl/sounds/vm-Work.gsm
    team/group/ami_ssl/sounds/vm-advopts.gsm
    team/group/ami_ssl/sounds/vm-and.gsm
    team/group/ami_ssl/sounds/vm-calldiffnum.gsm
    team/group/ami_ssl/sounds/vm-changeto.gsm
    team/group/ami_ssl/sounds/vm-delete.gsm
    team/group/ami_ssl/sounds/vm-deleted.gsm
    team/group/ami_ssl/sounds/vm-dialout.gsm
    team/group/ami_ssl/sounds/vm-enter-num-to-call.gsm
    team/group/ami_ssl/sounds/vm-extension.gsm
    team/group/ami_ssl/sounds/vm-first.gsm
    team/group/ami_ssl/sounds/vm-for.gsm
    team/group/ami_ssl/sounds/vm-forward.gsm
    team/group/ami_ssl/sounds/vm-forwardoptions.gsm
    team/group/ami_ssl/sounds/vm-from-extension.gsm
    team/group/ami_ssl/sounds/vm-from-phonenumber.gsm
    team/group/ami_ssl/sounds/vm-from.gsm
    team/group/ami_ssl/sounds/vm-goodbye.gsm
    team/group/ami_ssl/sounds/vm-helpexit.gsm
    team/group/ami_ssl/sounds/vm-incorrect-mailbox.gsm
    team/group/ami_ssl/sounds/vm-incorrect.gsm
    team/group/ami_ssl/sounds/vm-instructions.gsm
    team/group/ami_ssl/sounds/vm-intro.gsm
    team/group/ami_ssl/sounds/vm-isonphone.gsm
    team/group/ami_ssl/sounds/vm-isunavail.gsm
    team/group/ami_ssl/sounds/vm-last.gsm
    team/group/ami_ssl/sounds/vm-leavemsg.gsm
    team/group/ami_ssl/sounds/vm-login.gsm
    team/group/ami_ssl/sounds/vm-mailboxfull.gsm
    team/group/ami_ssl/sounds/vm-message.gsm
    team/group/ami_ssl/sounds/vm-messages.gsm
    team/group/ami_ssl/sounds/vm-minutes.gsm
    team/group/ami_ssl/sounds/vm-mismatch.gsm
    team/group/ami_ssl/sounds/vm-msginstruct.gsm
    team/group/ami_ssl/sounds/vm-msgsaved.gsm
    team/group/ami_ssl/sounds/vm-newpassword.gsm
    team/group/ami_ssl/sounds/vm-newuser.gsm
    team/group/ami_ssl/sounds/vm-next.gsm
    team/group/ami_ssl/sounds/vm-no.gsm
    team/group/ami_ssl/sounds/vm-nobodyavail.gsm
    team/group/ami_ssl/sounds/vm-nobox.gsm
    team/group/ami_ssl/sounds/vm-nomore.gsm
    team/group/ami_ssl/sounds/vm-nonumber.gsm
    team/group/ami_ssl/sounds/vm-num-i-have.gsm
    team/group/ami_ssl/sounds/vm-onefor.gsm
    team/group/ami_ssl/sounds/vm-options.gsm
    team/group/ami_ssl/sounds/vm-opts.gsm
    team/group/ami_ssl/sounds/vm-passchanged.gsm
    team/group/ami_ssl/sounds/vm-password.gsm
    team/group/ami_ssl/sounds/vm-press.gsm
    team/group/ami_ssl/sounds/vm-prev.gsm
    team/group/ami_ssl/sounds/vm-reachoper.gsm
    team/group/ami_ssl/sounds/vm-rec-busy.gsm
    team/group/ami_ssl/sounds/vm-rec-name.gsm
    team/group/ami_ssl/sounds/vm-rec-temp.gsm
    team/group/ami_ssl/sounds/vm-rec-unv.gsm
    team/group/ami_ssl/sounds/vm-received.gsm
    team/group/ami_ssl/sounds/vm-reenterpassword.gsm
    team/group/ami_ssl/sounds/vm-repeat.gsm
    team/group/ami_ssl/sounds/vm-review.gsm
    team/group/ami_ssl/sounds/vm-saved.gsm
    team/group/ami_ssl/sounds/vm-savedto.gsm
    team/group/ami_ssl/sounds/vm-savefolder.gsm
    team/group/ami_ssl/sounds/vm-savemessage.gsm
    team/group/ami_ssl/sounds/vm-saveoper.gsm
    team/group/ami_ssl/sounds/vm-sorry.gsm
    team/group/ami_ssl/sounds/vm-star-cancel.gsm
    team/group/ami_ssl/sounds/vm-starmain.gsm
    team/group/ami_ssl/sounds/vm-tempgreetactive.gsm
    team/group/ami_ssl/sounds/vm-tempgreeting.gsm
    team/group/ami_ssl/sounds/vm-tempgreeting2.gsm
    team/group/ami_ssl/sounds/vm-tempremoved.gsm
    team/group/ami_ssl/sounds/vm-then-pound.gsm
    team/group/ami_ssl/sounds/vm-theperson.gsm
    team/group/ami_ssl/sounds/vm-tocallback.gsm
    team/group/ami_ssl/sounds/vm-tocallnum.gsm
    team/group/ami_ssl/sounds/vm-tocancel.gsm
    team/group/ami_ssl/sounds/vm-tocancelmsg.gsm
    team/group/ami_ssl/sounds/vm-toenternumber.gsm
    team/group/ami_ssl/sounds/vm-toforward.gsm
    team/group/ami_ssl/sounds/vm-tohearenv.gsm
    team/group/ami_ssl/sounds/vm-tomakecall.gsm
    team/group/ami_ssl/sounds/vm-tooshort.gsm
    team/group/ami_ssl/sounds/vm-toreply.gsm
    team/group/ami_ssl/sounds/vm-torerecord.gsm
    team/group/ami_ssl/sounds/vm-undelete.gsm
    team/group/ami_ssl/sounds/vm-undeleted.gsm
    team/group/ami_ssl/sounds/vm-unknown-caller.gsm
    team/group/ami_ssl/sounds/vm-whichbox.gsm
    team/group/ami_ssl/sounds/vm-youhave.gsm
Modified:
    team/group/ami_ssl/   (props changed)
    team/group/ami_ssl/.cleancount
    team/group/ami_ssl/CREDITS
    team/group/ami_ssl/Makefile
    team/group/ami_ssl/UPGRADE.txt
    team/group/ami_ssl/acl.c
    team/group/ami_ssl/app.c
    team/group/ami_ssl/apps/Makefile
    team/group/ami_ssl/apps/app_adsiprog.c
    team/group/ami_ssl/apps/app_alarmreceiver.c
    team/group/ami_ssl/apps/app_amd.c
    team/group/ami_ssl/apps/app_authenticate.c
    team/group/ami_ssl/apps/app_cdr.c
    team/group/ami_ssl/apps/app_chanisavail.c
    team/group/ami_ssl/apps/app_channelredirect.c
    team/group/ami_ssl/apps/app_chanspy.c
    team/group/ami_ssl/apps/app_controlplayback.c
    team/group/ami_ssl/apps/app_db.c
    team/group/ami_ssl/apps/app_dial.c
    team/group/ami_ssl/apps/app_dictate.c
    team/group/ami_ssl/apps/app_directed_pickup.c
    team/group/ami_ssl/apps/app_directory.c
    team/group/ami_ssl/apps/app_disa.c
    team/group/ami_ssl/apps/app_dumpchan.c
    team/group/ami_ssl/apps/app_echo.c
    team/group/ami_ssl/apps/app_exec.c
    team/group/ami_ssl/apps/app_externalivr.c
    team/group/ami_ssl/apps/app_festival.c
    team/group/ami_ssl/apps/app_flash.c
    team/group/ami_ssl/apps/app_forkcdr.c
    team/group/ami_ssl/apps/app_getcpeid.c
    team/group/ami_ssl/apps/app_hasnewvoicemail.c
    team/group/ami_ssl/apps/app_ices.c
    team/group/ami_ssl/apps/app_image.c
    team/group/ami_ssl/apps/app_ivrdemo.c
    team/group/ami_ssl/apps/app_lookupblacklist.c
    team/group/ami_ssl/apps/app_lookupcidname.c
    team/group/ami_ssl/apps/app_macro.c
    team/group/ami_ssl/apps/app_meetme.c
    team/group/ami_ssl/apps/app_milliwatt.c
    team/group/ami_ssl/apps/app_mixmonitor.c
    team/group/ami_ssl/apps/app_morsecode.c
    team/group/ami_ssl/apps/app_mp3.c
    team/group/ami_ssl/apps/app_nbscat.c
    team/group/ami_ssl/apps/app_osplookup.c
    team/group/ami_ssl/apps/app_page.c
    team/group/ami_ssl/apps/app_parkandannounce.c
    team/group/ami_ssl/apps/app_playback.c
    team/group/ami_ssl/apps/app_privacy.c
    team/group/ami_ssl/apps/app_queue.c
    team/group/ami_ssl/apps/app_random.c
    team/group/ami_ssl/apps/app_read.c
    team/group/ami_ssl/apps/app_readfile.c
    team/group/ami_ssl/apps/app_realtime.c
    team/group/ami_ssl/apps/app_record.c
    team/group/ami_ssl/apps/app_rpt.c
    team/group/ami_ssl/apps/app_sayunixtime.c
    team/group/ami_ssl/apps/app_senddtmf.c
    team/group/ami_ssl/apps/app_sendtext.c
    team/group/ami_ssl/apps/app_setcallerid.c
    team/group/ami_ssl/apps/app_setcdruserfield.c
    team/group/ami_ssl/apps/app_settransfercapability.c
    team/group/ami_ssl/apps/app_skel.c
    team/group/ami_ssl/apps/app_sms.c
    team/group/ami_ssl/apps/app_softhangup.c
    team/group/ami_ssl/apps/app_speech_utils.c
    team/group/ami_ssl/apps/app_stack.c
    team/group/ami_ssl/apps/app_system.c
    team/group/ami_ssl/apps/app_talkdetect.c
    team/group/ami_ssl/apps/app_test.c
    team/group/ami_ssl/apps/app_transfer.c
    team/group/ami_ssl/apps/app_url.c
    team/group/ami_ssl/apps/app_userevent.c
    team/group/ami_ssl/apps/app_verbose.c
    team/group/ami_ssl/apps/app_voicemail.c
    team/group/ami_ssl/apps/app_waitforring.c
    team/group/ami_ssl/apps/app_waitforsilence.c
    team/group/ami_ssl/apps/app_while.c
    team/group/ami_ssl/apps/app_zapateller.c
    team/group/ami_ssl/apps/app_zapbarge.c
    team/group/ami_ssl/apps/app_zapras.c
    team/group/ami_ssl/apps/app_zapscan.c
    team/group/ami_ssl/ast_expr2.c
    team/group/ami_ssl/ast_expr2.fl
    team/group/ami_ssl/ast_expr2.y
    team/group/ami_ssl/ast_expr2f.c
    team/group/ami_ssl/asterisk.8
    team/group/ami_ssl/asterisk.c
    team/group/ami_ssl/astmm.c
    team/group/ami_ssl/autoservice.c
    team/group/ami_ssl/build_tools/cflags.xml
    team/group/ami_ssl/build_tools/menuselect-deps.in
    team/group/ami_ssl/build_tools/menuselect.c
    team/group/ami_ssl/build_tools/menuselect.h
    team/group/ami_ssl/build_tools/menuselect_curses.c
    team/group/ami_ssl/build_tools/prep_moduledeps
    team/group/ami_ssl/callerid.c
    team/group/ami_ssl/cdr.c
    team/group/ami_ssl/cdr/Makefile
    team/group/ami_ssl/cdr/cdr_csv.c
    team/group/ami_ssl/cdr/cdr_custom.c
    team/group/ami_ssl/cdr/cdr_manager.c
    team/group/ami_ssl/cdr/cdr_odbc.c
    team/group/ami_ssl/cdr/cdr_pgsql.c
    team/group/ami_ssl/cdr/cdr_radius.c
    team/group/ami_ssl/cdr/cdr_sqlite.c
    team/group/ami_ssl/cdr/cdr_tds.c
    team/group/ami_ssl/channel.c
    team/group/ami_ssl/channels/Makefile
    team/group/ami_ssl/channels/chan_agent.c
    team/group/ami_ssl/channels/chan_alsa.c
    team/group/ami_ssl/channels/chan_features.c
    team/group/ami_ssl/channels/chan_h323.c
    team/group/ami_ssl/channels/chan_iax2.c
    team/group/ami_ssl/channels/chan_local.c
    team/group/ami_ssl/channels/chan_mgcp.c
    team/group/ami_ssl/channels/chan_misdn.c
    team/group/ami_ssl/channels/chan_nbs.c
    team/group/ami_ssl/channels/chan_oss.c
    team/group/ami_ssl/channels/chan_phone.c
    team/group/ami_ssl/channels/chan_sip.c
    team/group/ami_ssl/channels/chan_skinny.c
    team/group/ami_ssl/channels/chan_vpb.c
    team/group/ami_ssl/channels/chan_zap.c
    team/group/ami_ssl/channels/h323/h323.conf.sample
    team/group/ami_ssl/channels/iax2-parser.c
    team/group/ami_ssl/channels/iax2-provision.c
    team/group/ami_ssl/channels/misdn/chan_misdn_config.h
    team/group/ami_ssl/channels/misdn/ie.c
    team/group/ami_ssl/channels/misdn/isdn_lib.c
    team/group/ami_ssl/channels/misdn/isdn_lib.h
    team/group/ami_ssl/channels/misdn/isdn_msg_parser.c
    team/group/ami_ssl/channels/misdn_config.c
    team/group/ami_ssl/chanvars.c
    team/group/ami_ssl/cli.c
    team/group/ami_ssl/codecs/Makefile
    team/group/ami_ssl/codecs/codec_a_mu.c
    team/group/ami_ssl/codecs/codec_adpcm.c
    team/group/ami_ssl/codecs/codec_alaw.c
    team/group/ami_ssl/codecs/codec_g723_1.c
    team/group/ami_ssl/codecs/codec_g726.c
    team/group/ami_ssl/codecs/codec_gsm.c
    team/group/ami_ssl/codecs/codec_ilbc.c
    team/group/ami_ssl/codecs/codec_lpc10.c
    team/group/ami_ssl/codecs/codec_speex.c
    team/group/ami_ssl/codecs/codec_ulaw.c
    team/group/ami_ssl/codecs/gsm/Makefile
    team/group/ami_ssl/codecs/gsm/src/preprocess.c
    team/group/ami_ssl/codecs/lpc10/lpc10.h
    team/group/ami_ssl/codecs/lpc10/lpcini.c
    team/group/ami_ssl/config.c
    team/group/ami_ssl/configs/alsa.conf.sample
    team/group/ami_ssl/configs/extensions.conf.sample
    team/group/ami_ssl/configs/features.conf.sample
    team/group/ami_ssl/configs/indications.conf.sample
    team/group/ami_ssl/configs/mgcp.conf.sample
    team/group/ami_ssl/configs/misdn.conf.sample
    team/group/ami_ssl/configs/musiconhold.conf.sample
    team/group/ami_ssl/configs/oss.conf.sample
    team/group/ami_ssl/configs/rtp.conf.sample
    team/group/ami_ssl/configs/sip.conf.sample
    team/group/ami_ssl/configs/skinny.conf.sample
    team/group/ami_ssl/configs/voicemail.conf.sample
    team/group/ami_ssl/configs/zapata.conf.sample
    team/group/ami_ssl/configure
    team/group/ami_ssl/configure.ac
    team/group/ami_ssl/cryptostub.c
    team/group/ami_ssl/db.c
    team/group/ami_ssl/devicestate.c
    team/group/ami_ssl/dns.c
    team/group/ami_ssl/dnsmgr.c
    team/group/ami_ssl/doc/asterisk-conf.txt
    team/group/ami_ssl/doc/channelvariables.txt
    team/group/ami_ssl/doc/smdi.txt
    team/group/ami_ssl/doc/speechrec.txt
    team/group/ami_ssl/dsp.c
    team/group/ami_ssl/enum.c
    team/group/ami_ssl/file.c
    team/group/ami_ssl/formats/Makefile
    team/group/ami_ssl/formats/format_g723.c
    team/group/ami_ssl/formats/format_g726.c
    team/group/ami_ssl/formats/format_g729.c
    team/group/ami_ssl/formats/format_gsm.c
    team/group/ami_ssl/formats/format_h263.c
    team/group/ami_ssl/formats/format_h264.c
    team/group/ami_ssl/formats/format_ilbc.c
    team/group/ami_ssl/formats/format_jpeg.c
    team/group/ami_ssl/formats/format_ogg_vorbis.c
    team/group/ami_ssl/formats/format_pcm.c
    team/group/ami_ssl/formats/format_sln.c
    team/group/ami_ssl/formats/format_vox.c
    team/group/ami_ssl/formats/format_wav.c
    team/group/ami_ssl/formats/format_wav_gsm.c
    team/group/ami_ssl/frame.c
    team/group/ami_ssl/fskmodem.c
    team/group/ami_ssl/funcs/Makefile
    team/group/ami_ssl/funcs/func_base64.c
    team/group/ami_ssl/funcs/func_callerid.c
    team/group/ami_ssl/funcs/func_cdr.c
    team/group/ami_ssl/funcs/func_channel.c
    team/group/ami_ssl/funcs/func_curl.c
    team/group/ami_ssl/funcs/func_cut.c
    team/group/ami_ssl/funcs/func_db.c
    team/group/ami_ssl/funcs/func_enum.c
    team/group/ami_ssl/funcs/func_env.c
    team/group/ami_ssl/funcs/func_groupcount.c
    team/group/ami_ssl/funcs/func_language.c
    team/group/ami_ssl/funcs/func_logic.c
    team/group/ami_ssl/funcs/func_math.c
    team/group/ami_ssl/funcs/func_md5.c
    team/group/ami_ssl/funcs/func_moh.c
    team/group/ami_ssl/funcs/func_odbc.c
    team/group/ami_ssl/funcs/func_rand.c
    team/group/ami_ssl/funcs/func_realtime.c
    team/group/ami_ssl/funcs/func_sha1.c
    team/group/ami_ssl/funcs/func_strings.c
    team/group/ami_ssl/funcs/func_timeout.c
    team/group/ami_ssl/funcs/func_uri.c
    team/group/ami_ssl/http.c
    team/group/ami_ssl/image.c
    team/group/ami_ssl/include/   (props changed)
    team/group/ami_ssl/include/asterisk/   (props changed)
    team/group/ami_ssl/include/asterisk.h
    team/group/ami_ssl/include/asterisk/alaw.h
    team/group/ami_ssl/include/asterisk/app.h
    team/group/ami_ssl/include/asterisk/astmm.h
    team/group/ami_ssl/include/asterisk/callerid.h
    team/group/ami_ssl/include/asterisk/channel.h
    team/group/ami_ssl/include/asterisk/chanspy.h
    team/group/ami_ssl/include/asterisk/compat.h
    team/group/ami_ssl/include/asterisk/devicestate.h
    team/group/ami_ssl/include/asterisk/dnsmgr.h
    team/group/ami_ssl/include/asterisk/doxyref.h
    team/group/ami_ssl/include/asterisk/endian.h
    team/group/ami_ssl/include/asterisk/file.h
    team/group/ami_ssl/include/asterisk/frame.h
    team/group/ami_ssl/include/asterisk/linkedlists.h
    team/group/ami_ssl/include/asterisk/lock.h
    team/group/ami_ssl/include/asterisk/logger.h
    team/group/ami_ssl/include/asterisk/options.h
    team/group/ami_ssl/include/asterisk/rtp.h
    team/group/ami_ssl/include/asterisk/stringfields.h
    team/group/ami_ssl/include/asterisk/translate.h
    team/group/ami_ssl/include/asterisk/ulaw.h
    team/group/ami_ssl/include/asterisk/utils.h
    team/group/ami_ssl/indications.c
    team/group/ami_ssl/io.c
    team/group/ami_ssl/jitterbuf.c
    team/group/ami_ssl/loader.c
    team/group/ami_ssl/logger.c
    team/group/ami_ssl/makeopts.in
    team/group/ami_ssl/manager.c
    team/group/ami_ssl/md5.c
    team/group/ami_ssl/netsock.c
    team/group/ami_ssl/pbx.c
    team/group/ami_ssl/pbx/Makefile
    team/group/ami_ssl/pbx/ael/ael.flex
    team/group/ami_ssl/pbx/ael/ael.tab.c
    team/group/ami_ssl/pbx/ael/ael.y
    team/group/ami_ssl/pbx/ael/ael_lex.c
    team/group/ami_ssl/pbx/dundi-parser.c
    team/group/ami_ssl/pbx/pbx_ael.c
    team/group/ami_ssl/pbx/pbx_config.c
    team/group/ami_ssl/pbx/pbx_dundi.c
    team/group/ami_ssl/pbx/pbx_gtkconsole.c
    team/group/ami_ssl/pbx/pbx_loopback.c
    team/group/ami_ssl/pbx/pbx_realtime.c
    team/group/ami_ssl/pbx/pbx_spool.c
    team/group/ami_ssl/plc.c
    team/group/ami_ssl/privacy.c
    team/group/ami_ssl/res/Makefile
    team/group/ami_ssl/res/res_adsi.c
    team/group/ami_ssl/res/res_agi.c
    team/group/ami_ssl/res/res_clioriginate.c
    team/group/ami_ssl/res/res_config_odbc.c
    team/group/ami_ssl/res/res_config_pgsql.c
    team/group/ami_ssl/res/res_convert.c
    team/group/ami_ssl/res/res_crypto.c
    team/group/ami_ssl/res/res_features.c
    team/group/ami_ssl/res/res_indications.c
    team/group/ami_ssl/res/res_monitor.c
    team/group/ami_ssl/res/res_musiconhold.c
    team/group/ami_ssl/res/res_odbc.c
    team/group/ami_ssl/res/res_osp.c
    team/group/ami_ssl/res/res_smdi.c
    team/group/ami_ssl/res/res_snmp.c
    team/group/ami_ssl/res/res_speech.c
    team/group/ami_ssl/res/snmp/agent.c
    team/group/ami_ssl/rtp.c
    team/group/ami_ssl/sample.call
    team/group/ami_ssl/say.c
    team/group/ami_ssl/sched.c
    team/group/ami_ssl/slinfactory.c
    team/group/ami_ssl/sounds/   (props changed)
    team/group/ami_ssl/sounds.txt
    team/group/ami_ssl/srv.c
    team/group/ami_ssl/stdtime/localtime.c
    team/group/ami_ssl/strcompat.c
    team/group/ami_ssl/tdd.c
    team/group/ami_ssl/term.c
    team/group/ami_ssl/translate.c
    team/group/ami_ssl/udptl.c
    team/group/ami_ssl/utils.c
    team/group/ami_ssl/utils/Makefile
    team/group/ami_ssl/utils/ael_main.c
    team/group/ami_ssl/utils/astman.c
    team/group/ami_ssl/utils/smsq.c

Propchange: team/group/ami_ssl/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/group/ami_ssl/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/group/ami_ssl/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/group/ami_ssl/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 14 09:12:11 2006
@@ -1,1 +1,1 @@
-/trunk:1-29519
+/trunk:1-34085

Modified: team/group/ami_ssl/.cleancount
URL: http://svn.digium.com/view/asterisk/team/group/ami_ssl/.cleancount?rev=34089&r1=34088&r2=34089&view=diff
==============================================================================
--- team/group/ami_ssl/.cleancount (original)
+++ team/group/ami_ssl/.cleancount Wed Jun 14 09:12:11 2006
@@ -1,1 +1,1 @@
-17
+19

Modified: team/group/ami_ssl/CREDITS
URL: http://svn.digium.com/view/asterisk/team/group/ami_ssl/CREDITS?rev=34089&r1=34088&r2=34089&view=diff
==============================================================================
--- team/group/ami_ssl/CREDITS (original)
+++ team/group/ami_ssl/CREDITS Wed Jun 14 09:12:11 2006
@@ -27,58 +27,110 @@
 * Thanks to QuickNet Technologies for their donation of an Internet
 PhoneJack and Linejack card to the project.  (http://www.quicknet.net)
 
+* Thanks to VoipSupply for their donation of Sipura ATAs to the project for
+T.38 testing. (http://www.voipsupply.com)
+
+* Thanks to Grandstream for their donation of ATAs to the project for
+T.38 testing. (http://www.grandstream.com)
+
 === MISCELLANEOUS PATCHES ===
 Jim Dixon - Zapata Telephony and app_rpt
 	http://www.zapatatelephony.org/app_rpt.html
+
 Russell Bryant - Asterisk 1.0 maintainer and misc. enhancements
 	russelb at clemson.edu
+
 Anthony Minessale II - Countless big and small fixes, and relentless forward push
 	anthmct at yahoo.com              http://www.asterlink.com
+
 James Golovich - Innumerable contributions
 	You can find him and asterisk-perl at http://asterisk.gnuinter.net
+
 Andre Bierwirth - Extension hints and status
+
 Oliver Daudey - ISDN4Linux fixes
+
 Pauline Middelink - ISDN4Linux patches and some general patches.
 	She can be found at http://www.polyware.nl/~middelink/En/
+
 Jean-Denis Girard - Various contributions from the South Pacific Islands
 	jd-girard at esoft.pf             http://www.esoft.pf
+
 William Jordan / Vonage - MySQL enhancements to Voicemail
 	wjordan at vonage.com
+
 Jac Kersing - Various fixes
+
 Steven Critchfield - Seek and Trunc functions for playback and recording
 	critch at basesys.com
+
 Jefferson Noxon - app_lookupcidname, app_db, and various other contributions
+
 Klaus-Peter Junghanns - in-band DTMF on SIP and MGCP
+
 Ross Finlayson - Dynamic RTP payload support
+
 Mahmut Fettahlioglu - Audio recording, music-on-hold changes, alaw file
 	format, and various fixes. Can be contacted at mahmut at oa.com.au
+
 James Dennis - Cisco SIP compatibility patches to work with SIP service
 	providers. Can be contacted at asterisk at jdennis.net
+
 Tilghman Lesher - ast_localtime(); ast_say_date_with_format(); 
 	GotoIfTime, Random, SayUnixTime, HasNewVoicemail applications;
 	CUT, SORT, EVAL, CURL, FIELDQTY, STRFTIME, QUEUEAGENT* functions;
 	and other innumerable bug fixes. http://asterisk.drunkcoder.com/
+
 Jayson Vantuyl - Manager protocol changes, various other bugs.
 	jvantuyl at computingedge.net
+
 Thorsten Lockert - OpenBSD, FreeBSD ports, making MacOS X port run on 10.3,
 	dialplan include verification, route lookup on OpenBSD, SNMP agent
 	support (res_snmp), various other bugs. tholo at sigmasoft.com
+
 Brian West - ODBC support and Bug Marshaling  
+
 Josh Roberson - chan_zap reload support, Advanced Voicemail Features, other misc. patches,
 	and Bug Marshalling. - josh at asteriasgi.com, http://www.asteriasgi.com
+
 William Waites - syslog support, SIP NAT traversal for SIP-UA. ww at styx.org
+
 Rich Murphey - Porting to FreeBSD, NetBSD, OpenBSD, and Darwin.
 	rich at whiteoaklabs.com  http://whiteoaklabs.com
+
 Simon Lockhart - Porting to Solaris (based on work of Logan ???)	
 	simon at slimey.org
+
 Olle E. Johansson - SIP RFC compliance, documentation and testing, testing, testing
 	oej at edvina.net, http://edvina.net
+
 Steve Kann - new jitter buffer for IAX2
 	stevek at stevek.com
+
 Constantine Filin - major contributions to the Asterisk Realtime Architecture
+
 Steve Murphy - privacy support, $[ ] parser upgrade, AEL2 parser upgrade
+
 Claude Patry - bug fixes, feature enhancements, and bug marshalling
 	cpatry at gmail.com
+
+Miroslav Nachev, miro at space-comm.com COSMOS Software Enterprises, Ltd.
+	- for Variable for No Answer Timeout for Attended Transfer
+
+Slav Klenov & Vanheuverzwijn Joachim - development of the generic jitterbuffer
+	Securax Ltd. info at securax.be
+
+Roy Sigurd Karlsbakk - providing funding for generic jitterbuffer development
+	roy at karlsbakk.net, Briiz Telecom AS
+
+Voop A/S, Nuvio Inc and Foniris Telecom A/S - funding for rewrite of SIP transfers
+
+Philippe Sultan - RADIUS CDR module
+	INRIA, http://www.inria.fr/
+
+John Martin, Aupix - Improved video support in the SIP channel
+
+Steve Underwood - Provided T.38 pass through support.
 
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt

Modified: team/group/ami_ssl/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/ami_ssl/Makefile?rev=34089&r1=34088&r2=34089&view=diff
==============================================================================
--- team/group/ami_ssl/Makefile (original)
+++ team/group/ami_ssl/Makefile Wed Jun 14 09:12:11 2006
@@ -13,6 +13,8 @@
 
 .EXPORT_ALL_VARIABLES:
 
+.PHONY: sounds
+
 # Create OPTIONS variable
 OPTIONS=
 
@@ -36,22 +38,6 @@
 
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-# 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
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -95,14 +81,18 @@
 else
   ASTETCDIR=$(sysconfdir)/asterisk
   ASTLIBDIR=$(libdir)/asterisk
-  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
-  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
-  ASTLOGDIR=$(localstatedir)/log/asterisk
   ASTHEADERDIR=$(includedir)/asterisk
   ASTBINDIR=$(bindir)
   ASTSBINDIR=$(sbindir)
+  ASTSPOOLDIR=$(localstatedir)/spool/asterisk
+  ASTLOGDIR=$(localstatedir)/log/asterisk
   ASTVARRUNDIR=$(localstatedir)/run
   ASTMANDIR=$(mandir)
+ifeq ($(OSARCH),FreeBSD)
+  ASTVARLIBDIR=$(prefix)/share/asterisk
+else
+  ASTVARLIBDIR=$(localstatedir)/lib/asterisk
+endif
 endif
 ASTDATADIR?=$(ASTVARLIBDIR)
 
@@ -144,9 +134,32 @@
   include makeopts
 endif
 
-TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
-MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
-OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+TOPDIR_CFLAGS=-Iinclude
+MOD_SUBDIR_CFLAGS=-I../include -I..
+OTHER_SUBDIR_CFLAGS=-I../include -I..
+
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
+  ifeq ($(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
+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]
@@ -188,7 +201,6 @@
       endif
     endif
   endif
-  MPG123TARG=linux
 endif
 
 GREP=grep
@@ -231,12 +243,10 @@
   ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
     ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
-  MPG123TARG=freebsd
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
   AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
-  MPG123TARG=netbsd
 endif
 
 ifeq ($(OSARCH),OpenBSD)
@@ -283,7 +293,7 @@
 	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
+	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
@@ -376,7 +386,7 @@
 	@echo " +               make install                +"  
 	@echo " +-------------------------------------------+"  
 
-all: cleantest defaults.h config.status menuselect.makeopts depend asterisk subdirs
+all: cleantest config.status menuselect.makeopts depend asterisk subdirs
 
 config.status: configure
 	@CFLAGS="" ./configure
@@ -508,19 +518,19 @@
 	rm -f include/asterisk/version.h
 	rm -f .tags-sources tags TAGS
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
-	@if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
 	$(MAKE) -C db1-ast clean
 	$(MAKE) -C stdtime clean
 
 distclean: dist-clean
 
 dist-clean: clean
+	$(MAKE) -C mxml clean
+	$(MAKE) -C build_tools dist-clean
+	$(MAKE) -C sounds dist-clean
 	rm -f menuselect.makeopts makeopts makeopts.xml
 	rm -f config.log config.status
 	rm -f include/autoconfig.h
 	rm -f include/asterisk/buildopts.h
-	$(MAKE) -C mxml clean
-	$(MAKE) -C build_tools dist-clean
 
 datafiles: all
 	if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -531,57 +541,12 @@
 	for x in static-http/*; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
-	for x in sounds/digits/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
-	for x in sounds/dictate/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
-	for x in sounds/letters/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
-	for x in sounds/phonetic/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
 	for x in images/*.jpg; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
+	$(MAKE) -C sounds install
 
 update: 
 	@if [ -d .svn ]; then \
@@ -633,11 +598,11 @@
 		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
 	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
 	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
@@ -655,7 +620,6 @@
 	else \
 		echo "You need to do cvs update -d not just cvs update" ; \
 	fi 
-	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 
 install-subdirs:
 	@for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
@@ -768,20 +732,6 @@
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
-	for x in sounds/demo-*; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
-	for x in sounds/*.mp3; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
-	done
-	rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
@@ -835,12 +785,6 @@
 progdocs:
 	(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
 	echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
-
-mpg123:
-	@wget -V >/dev/null || (echo "You need wget" ; false )
-	[ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
-	[ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
-	$(MAKE) -C mpg123-0.59r $(MPG123TARG)
 
 config:
 	@if [ "${OSARCH}" = "Linux" ]; then \
@@ -910,6 +854,9 @@
 
 %_env:
 	$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
+
+sounds:
+	$(MAKE) -C sounds all
 
 env:
 	env
@@ -974,6 +921,7 @@
 cleantest:
 	@if cmp -s .cleancount .lastclean ; then echo ; else \
 		$(MAKE) clean; cp -f .cleancount .lastclean;\
+		$(MAKE) defaults.h;\
 	fi
 
 _uninstall:
@@ -982,10 +930,10 @@
 	rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
 	rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
 	rm -rf $(DESTDIR)$(ASTHEADERDIR)
-	rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
 	rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
 	rm -rf $(DESTDIR)$(ASTMANDIR)/man8
 	for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+	$(MAKE) -C sounds uninstall
 
 uninstall: _uninstall
 	@echo " +--------- Asterisk Uninstall Complete -----+"  
@@ -1019,6 +967,6 @@

[... 58518 lines stripped ...]

More information about the asterisk-commits mailing list