[svn-commits] snuffy: branch snuffy/ao2_jabber_take2 r209956 - in /team/snuffy/ao2_jabber_t...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Sat Aug 1 18:08:18 CDT 2009
Author: snuffy
Date: Sat Aug 1 18:07:57 2009
New Revision: 209956
URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=209956
Log:
merge me
Added:
team/snuffy/ao2_jabber_take2/README-addons.txt
- copied unchanged from r209887, trunk/README-addons.txt
team/snuffy/ao2_jabber_take2/addons/ (props changed)
- copied from r209887, trunk/addons/
team/snuffy/ao2_jabber_take2/addons/Makefile
- copied unchanged from r209887, trunk/addons/Makefile
team/snuffy/ao2_jabber_take2/addons/app_mysql.c
- copied unchanged from r209887, trunk/addons/app_mysql.c
team/snuffy/ao2_jabber_take2/addons/app_saycountpl.c
- copied unchanged from r209887, trunk/addons/app_saycountpl.c
team/snuffy/ao2_jabber_take2/addons/cdr_mysql.c
- copied unchanged from r209887, trunk/addons/cdr_mysql.c
team/snuffy/ao2_jabber_take2/addons/chan_mobile.c
- copied unchanged from r209887, trunk/addons/chan_mobile.c
team/snuffy/ao2_jabber_take2/addons/chan_ooh323.c
- copied unchanged from r209887, trunk/addons/chan_ooh323.c
team/snuffy/ao2_jabber_take2/addons/chan_ooh323.h
- copied unchanged from r209887, trunk/addons/chan_ooh323.h
team/snuffy/ao2_jabber_take2/addons/format_mp3.c
- copied unchanged from r209887, trunk/addons/format_mp3.c
team/snuffy/ao2_jabber_take2/addons/mp3/
- copied from r209887, trunk/addons/mp3/
team/snuffy/ao2_jabber_take2/addons/mp3/MPGLIB_README
- copied unchanged from r209887, trunk/addons/mp3/MPGLIB_README
team/snuffy/ao2_jabber_take2/addons/mp3/MPGLIB_TODO
- copied unchanged from r209887, trunk/addons/mp3/MPGLIB_TODO
team/snuffy/ao2_jabber_take2/addons/mp3/Makefile
- copied unchanged from r209887, trunk/addons/mp3/Makefile
team/snuffy/ao2_jabber_take2/addons/mp3/README
- copied unchanged from r209887, trunk/addons/mp3/README
team/snuffy/ao2_jabber_take2/addons/mp3/common.c
- copied unchanged from r209887, trunk/addons/mp3/common.c
team/snuffy/ao2_jabber_take2/addons/mp3/dct64_i386.c
- copied unchanged from r209887, trunk/addons/mp3/dct64_i386.c
team/snuffy/ao2_jabber_take2/addons/mp3/decode_i386.c
- copied unchanged from r209887, trunk/addons/mp3/decode_i386.c
team/snuffy/ao2_jabber_take2/addons/mp3/decode_ntom.c
- copied unchanged from r209887, trunk/addons/mp3/decode_ntom.c
team/snuffy/ao2_jabber_take2/addons/mp3/huffman.h
- copied unchanged from r209887, trunk/addons/mp3/huffman.h
team/snuffy/ao2_jabber_take2/addons/mp3/interface.c
- copied unchanged from r209887, trunk/addons/mp3/interface.c
team/snuffy/ao2_jabber_take2/addons/mp3/layer3.c
- copied unchanged from r209887, trunk/addons/mp3/layer3.c
team/snuffy/ao2_jabber_take2/addons/mp3/mpg123.h
- copied unchanged from r209887, trunk/addons/mp3/mpg123.h
team/snuffy/ao2_jabber_take2/addons/mp3/mpglib.h
- copied unchanged from r209887, trunk/addons/mp3/mpglib.h
team/snuffy/ao2_jabber_take2/addons/mp3/tabinit.c
- copied unchanged from r209887, trunk/addons/mp3/tabinit.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/
- copied from r209887, trunk/addons/ooh323c/
team/snuffy/ao2_jabber_take2/addons/ooh323c/COPYING
- copied unchanged from r209887, trunk/addons/ooh323c/COPYING
team/snuffy/ao2_jabber_take2/addons/ooh323c/README
- copied unchanged from r209887, trunk/addons/ooh323c/README
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/
- copied from r209887, trunk/addons/ooh323c/src/
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/Makefile.in
- copied unchanged from r209887, trunk/addons/ooh323c/src/Makefile.in
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/context.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/context.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/decode.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/decode.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/dlist.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/dlist.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/dlist.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/dlist.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/encode.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/encode.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/errmgmt.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/errmgmt.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/eventHandler.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/eventHandler.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/eventHandler.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/eventHandler.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/
- copied from r209887, trunk/addons/ooh323c/src/h323/
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/H235-SECURITY-MESSAGES.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESDec.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/H235-SECURITY-MESSAGESEnc.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/H323-MESSAGES.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/H323-MESSAGES.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/H323-MESSAGES.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/H323-MESSAGES.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/H323-MESSAGESDec.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/H323-MESSAGESDec.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/H323-MESSAGESEnc.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/H323-MESSAGESEnc.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROL.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLDec.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/h323/MULTIMEDIA-SYSTEM-CONTROLEnc.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/memheap.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/memheap.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/memheap.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/memheap.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooCalls.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooCalls.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooCalls.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooCalls.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooCapability.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooCapability.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooCapability.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooCapability.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooCmdChannel.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooCmdChannel.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooCmdChannel.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooCmdChannel.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooCommon.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooCommon.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooDateTime.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooDateTime.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooDateTime.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooDateTime.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooGkClient.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooGkClient.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooGkClient.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooGkClient.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooLogChan.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooLogChan.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooLogChan.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooLogChan.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooSocket.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooSocket.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooSocket.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooSocket.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooStackCmds.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooStackCmds.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooStackCmds.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooStackCmds.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooTimer.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooTimer.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooTimer.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooTimer.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooUtils.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooUtils.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooUtils.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooUtils.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooasn1.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooasn1.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/oochannels.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/oochannels.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/oochannels.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/oochannels.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooh245.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooh245.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooh245.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooh245.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooh323.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooh323.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooh323.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooh323.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooh323ep.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooh323ep.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooh323ep.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooh323ep.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/oohdr.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/oohdr.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooper.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooper.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooports.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooports.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooports.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooports.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooq931.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooq931.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ooq931.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ooq931.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ootrace.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/ootrace.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ootrace.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ootrace.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/ootypes.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/ootypes.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/perutil.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/perutil.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/printHandler.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/printHandler.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/printHandler.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/printHandler.h
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/rtctype.c
- copied unchanged from r209887, trunk/addons/ooh323c/src/rtctype.c
team/snuffy/ao2_jabber_take2/addons/ooh323c/src/rtctype.h
- copied unchanged from r209887, trunk/addons/ooh323c/src/rtctype.h
team/snuffy/ao2_jabber_take2/addons/ooh323cDriver.c
- copied unchanged from r209887, trunk/addons/ooh323cDriver.c
team/snuffy/ao2_jabber_take2/addons/ooh323cDriver.h
- copied unchanged from r209887, trunk/addons/ooh323cDriver.h
team/snuffy/ao2_jabber_take2/addons/res_config_mysql.c
- copied unchanged from r209887, trunk/addons/res_config_mysql.c
team/snuffy/ao2_jabber_take2/configs/app_mysql.conf.sample
- copied unchanged from r209887, trunk/configs/app_mysql.conf.sample
team/snuffy/ao2_jabber_take2/configs/cdr_mysql.conf.sample
- copied unchanged from r209887, trunk/configs/cdr_mysql.conf.sample
team/snuffy/ao2_jabber_take2/configs/chan_mobile.conf.sample
- copied unchanged from r209887, trunk/configs/chan_mobile.conf.sample
team/snuffy/ao2_jabber_take2/configs/chan_ooh323.conf.sample
- copied unchanged from r209887, trunk/configs/chan_ooh323.conf.sample
team/snuffy/ao2_jabber_take2/configs/res_config_mysql.conf.sample
- copied unchanged from r209887, trunk/configs/res_config_mysql.conf.sample
team/snuffy/ao2_jabber_take2/configs/res_config_sqlite.conf.sample
- copied unchanged from r209887, trunk/configs/res_config_sqlite.conf.sample
team/snuffy/ao2_jabber_take2/doc/tex/chan_mobile.tex
- copied unchanged from r209887, trunk/doc/tex/chan_mobile.tex
team/snuffy/ao2_jabber_take2/doc/tex/security-events.tex
- copied unchanged from r209887, trunk/doc/tex/security-events.tex
team/snuffy/ao2_jabber_take2/include/asterisk/security_events.h
- copied unchanged from r209887, trunk/include/asterisk/security_events.h
team/snuffy/ao2_jabber_take2/include/asterisk/security_events_defs.h
- copied unchanged from r209887, trunk/include/asterisk/security_events_defs.h
team/snuffy/ao2_jabber_take2/main/security_events.c
- copied unchanged from r209887, trunk/main/security_events.c
team/snuffy/ao2_jabber_take2/main/ssl.c
- copied unchanged from r209887, trunk/main/ssl.c
team/snuffy/ao2_jabber_take2/res/res_security_log.c
- copied unchanged from r209887, trunk/res/res_security_log.c
team/snuffy/ao2_jabber_take2/tests/test_ami_security_events.sh
- copied unchanged from r209887, trunk/tests/test_ami_security_events.sh
team/snuffy/ao2_jabber_take2/tests/test_security_events.c
- copied unchanged from r209887, trunk/tests/test_security_events.c
Removed:
team/snuffy/ao2_jabber_take2/configs/res_config_sqlite.conf
Modified:
team/snuffy/ao2_jabber_take2/ (props changed)
team/snuffy/ao2_jabber_take2/.cleancount
team/snuffy/ao2_jabber_take2/CHANGES
team/snuffy/ao2_jabber_take2/Makefile
team/snuffy/ao2_jabber_take2/Makefile.moddir_rules
team/snuffy/ao2_jabber_take2/Makefile.rules
team/snuffy/ao2_jabber_take2/UPGRADE.txt
team/snuffy/ao2_jabber_take2/agi/Makefile
team/snuffy/ao2_jabber_take2/apps/app_dial.c
team/snuffy/ao2_jabber_take2/apps/app_directed_pickup.c
team/snuffy/ao2_jabber_take2/apps/app_fax.c
team/snuffy/ao2_jabber_take2/apps/app_festival.c
team/snuffy/ao2_jabber_take2/apps/app_forkcdr.c
team/snuffy/ao2_jabber_take2/apps/app_meetme.c
team/snuffy/ao2_jabber_take2/apps/app_milliwatt.c
team/snuffy/ao2_jabber_take2/apps/app_queue.c
team/snuffy/ao2_jabber_take2/apps/app_rpt.c
team/snuffy/ao2_jabber_take2/apps/app_sms.c
team/snuffy/ao2_jabber_take2/apps/app_voicemail.c
team/snuffy/ao2_jabber_take2/autoconf/ast_ext_tool_check.m4
team/snuffy/ao2_jabber_take2/bootstrap.sh
team/snuffy/ao2_jabber_take2/build_tools/embed_modules.xml
team/snuffy/ao2_jabber_take2/build_tools/menuselect-deps.in
team/snuffy/ao2_jabber_take2/channels/Makefile
team/snuffy/ao2_jabber_take2/channels/chan_alsa.c
team/snuffy/ao2_jabber_take2/channels/chan_console.c
team/snuffy/ao2_jabber_take2/channels/chan_dahdi.c
team/snuffy/ao2_jabber_take2/channels/chan_iax2.c
team/snuffy/ao2_jabber_take2/channels/chan_misdn.c
team/snuffy/ao2_jabber_take2/channels/chan_oss.c
team/snuffy/ao2_jabber_take2/channels/chan_sip.c
team/snuffy/ao2_jabber_take2/channels/chan_skinny.c
team/snuffy/ao2_jabber_take2/channels/chan_usbradio.c
team/snuffy/ao2_jabber_take2/channels/chan_vpb.cc
team/snuffy/ao2_jabber_take2/channels/misdn/ie.c
team/snuffy/ao2_jabber_take2/channels/misdn/isdn_lib.c
team/snuffy/ao2_jabber_take2/channels/misdn/isdn_lib.h
team/snuffy/ao2_jabber_take2/channels/misdn/isdn_lib_intern.h
team/snuffy/ao2_jabber_take2/channels/sig_analog.c
team/snuffy/ao2_jabber_take2/channels/sig_analog.h
team/snuffy/ao2_jabber_take2/channels/sig_pri.c
team/snuffy/ao2_jabber_take2/channels/sig_pri.h
team/snuffy/ao2_jabber_take2/codecs/Makefile
team/snuffy/ao2_jabber_take2/codecs/codec_dahdi.c
team/snuffy/ao2_jabber_take2/codecs/gsm/Makefile
team/snuffy/ao2_jabber_take2/codecs/lpc10/Makefile
team/snuffy/ao2_jabber_take2/codecs/lpc10/pitsyn.c
team/snuffy/ao2_jabber_take2/config.guess
team/snuffy/ao2_jabber_take2/config.sub
team/snuffy/ao2_jabber_take2/configs/cel.conf.sample
team/snuffy/ao2_jabber_take2/configs/cel_adaptive_odbc.conf.sample
team/snuffy/ao2_jabber_take2/configs/cel_custom.conf.sample
team/snuffy/ao2_jabber_take2/configs/cel_pgsql.conf.sample
team/snuffy/ao2_jabber_take2/configs/cel_sqlite3_custom.conf.sample
team/snuffy/ao2_jabber_take2/configs/chan_dahdi.conf.sample
team/snuffy/ao2_jabber_take2/configs/cli_aliases.conf.sample
team/snuffy/ao2_jabber_take2/configs/http.conf.sample
team/snuffy/ao2_jabber_take2/configs/iax.conf.sample
team/snuffy/ao2_jabber_take2/configs/sip.conf.sample
team/snuffy/ao2_jabber_take2/configs/udptl.conf.sample
team/snuffy/ao2_jabber_take2/configure
team/snuffy/ao2_jabber_take2/configure.ac
team/snuffy/ao2_jabber_take2/contrib/init.d/rc.debian.asterisk
team/snuffy/ao2_jabber_take2/contrib/scripts/install_prereq
team/snuffy/ao2_jabber_take2/contrib/scripts/meetme.sql
team/snuffy/ao2_jabber_take2/contrib/upstart/asterisk.upstart-0.3.9
team/snuffy/ao2_jabber_take2/doc/CODING-GUIDELINES
team/snuffy/ao2_jabber_take2/doc/tex/Makefile
team/snuffy/ao2_jabber_take2/doc/tex/asterisk.tex
team/snuffy/ao2_jabber_take2/doc/tex/cdrdriver.tex
team/snuffy/ao2_jabber_take2/doc/tex/odbcstorage.tex
team/snuffy/ao2_jabber_take2/doc/video_console.txt
team/snuffy/ao2_jabber_take2/doc/voicemail_odbc_postgresql.txt
team/snuffy/ao2_jabber_take2/funcs/Makefile
team/snuffy/ao2_jabber_take2/funcs/func_channel.c
team/snuffy/ao2_jabber_take2/funcs/func_math.c
team/snuffy/ao2_jabber_take2/funcs/func_odbc.c
team/snuffy/ao2_jabber_take2/funcs/func_realtime.c
team/snuffy/ao2_jabber_take2/funcs/func_strings.c
team/snuffy/ao2_jabber_take2/funcs/func_timeout.c
team/snuffy/ao2_jabber_take2/include/asterisk/_private.h
team/snuffy/ao2_jabber_take2/include/asterisk/abstract_jb.h
team/snuffy/ao2_jabber_take2/include/asterisk/autoconfig.h.in
team/snuffy/ao2_jabber_take2/include/asterisk/channel.h
team/snuffy/ao2_jabber_take2/include/asterisk/compat.h
team/snuffy/ao2_jabber_take2/include/asterisk/devicestate.h
team/snuffy/ao2_jabber_take2/include/asterisk/event_defs.h
team/snuffy/ao2_jabber_take2/include/asterisk/frame.h
team/snuffy/ao2_jabber_take2/include/asterisk/mod_format.h
team/snuffy/ao2_jabber_take2/include/asterisk/module.h
team/snuffy/ao2_jabber_take2/include/asterisk/pbx.h
team/snuffy/ao2_jabber_take2/include/asterisk/rtp_engine.h
team/snuffy/ao2_jabber_take2/include/asterisk/time.h
team/snuffy/ao2_jabber_take2/include/asterisk/udptl.h
team/snuffy/ao2_jabber_take2/include/asterisk/utils.h
team/snuffy/ao2_jabber_take2/main/Makefile
team/snuffy/ao2_jabber_take2/main/asterisk.c
team/snuffy/ao2_jabber_take2/main/asterisk.exports
team/snuffy/ao2_jabber_take2/main/callerid.c
team/snuffy/ao2_jabber_take2/main/cel.c
team/snuffy/ao2_jabber_take2/main/channel.c
team/snuffy/ao2_jabber_take2/main/cli.c
team/snuffy/ao2_jabber_take2/main/db1-ast/Makefile
team/snuffy/ao2_jabber_take2/main/db1-ast/mpool/mpool.c
team/snuffy/ao2_jabber_take2/main/devicestate.c
team/snuffy/ao2_jabber_take2/main/dns.c
team/snuffy/ao2_jabber_take2/main/event.c
team/snuffy/ao2_jabber_take2/main/features.c
team/snuffy/ao2_jabber_take2/main/file.c
team/snuffy/ao2_jabber_take2/main/frame.c
team/snuffy/ao2_jabber_take2/main/loader.c
team/snuffy/ao2_jabber_take2/main/manager.c
team/snuffy/ao2_jabber_take2/main/pbx.c
team/snuffy/ao2_jabber_take2/main/poll.c
team/snuffy/ao2_jabber_take2/main/rtp_engine.c
team/snuffy/ao2_jabber_take2/main/say.c
team/snuffy/ao2_jabber_take2/main/strcompat.c
team/snuffy/ao2_jabber_take2/main/translate.c
team/snuffy/ao2_jabber_take2/main/udptl.c
team/snuffy/ao2_jabber_take2/makeopts.in
team/snuffy/ao2_jabber_take2/pbx/Makefile
team/snuffy/ao2_jabber_take2/pbx/pbx_config.c
team/snuffy/ao2_jabber_take2/pbx/pbx_dundi.c
team/snuffy/ao2_jabber_take2/res/Makefile
team/snuffy/ao2_jabber_take2/res/res_crypto.c
team/snuffy/ao2_jabber_take2/res/res_jabber.c
team/snuffy/ao2_jabber_take2/res/res_musiconhold.c
team/snuffy/ao2_jabber_take2/res/res_realtime.c
team/snuffy/ao2_jabber_take2/res/res_rtp_asterisk.c
team/snuffy/ao2_jabber_take2/res/res_smdi.c
team/snuffy/ao2_jabber_take2/sounds/sounds.xml
team/snuffy/ao2_jabber_take2/utils/Makefile
team/snuffy/ao2_jabber_take2/utils/frame.c
team/snuffy/ao2_jabber_take2/utils/muted.c
Propchange: team/snuffy/ao2_jabber_take2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.
Propchange: team/snuffy/ao2_jabber_take2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.
Propchange: team/snuffy/ao2_jabber_take2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Aug 1 18:07:57 2009
@@ -1,1 +1,1 @@
-/trunk:1-204114
+/trunk:1-209955
Modified: team/snuffy/ao2_jabber_take2/.cleancount
URL: http://svn.asterisk.org/svn-view/asterisk/team/snuffy/ao2_jabber_take2/.cleancount?view=diff&rev=209956&r1=209955&r2=209956
==============================================================================
--- team/snuffy/ao2_jabber_take2/.cleancount (original)
+++ team/snuffy/ao2_jabber_take2/.cleancount Sat Aug 1 18:07:57 2009
@@ -1,1 +1,2 @@
-36
+37
+
Modified: team/snuffy/ao2_jabber_take2/CHANGES
URL: http://svn.asterisk.org/svn-view/asterisk/team/snuffy/ao2_jabber_take2/CHANGES?view=diff&rev=209956&r1=209955&r2=209956
==============================================================================
--- team/snuffy/ao2_jabber_take2/CHANGES (original)
+++ team/snuffy/ao2_jabber_take2/CHANGES Sat Aug 1 18:07:57 2009
@@ -39,6 +39,11 @@
* Added rtsavesysname option into iax.conf to allow the systname to be saved
on realtime updates.
+DAHDI Changes
+-------------
+ * Added Reverse Charging Indication receipt & transmission (requires latest
+ LibPRI).
+
Applications
------------
* Added progress option to the app_dial D() option. When progress DTMF is
@@ -104,7 +109,8 @@
used by the rest of the system.
* Made use the nationalprefix and internationalprefix misdn.conf
parameters to prefix any received number from the ISDN link if that
- number has the corresponding Type-Of-Number.
+ number has the corresponding Type-Of-Number. NOTE: This includes
+ comparing the incoming call's dialed number against the MSN list.
* Added the following new parameters: unknownprefix, netspecificprefix,
subscriberprefix, and abbreviatedprefix in misdn.conf to prefix any
received number from the ISDN link if that number has the corresponding
@@ -176,6 +182,14 @@
Destination is the IP address and port for the RTP packets.
Control address is specific to the linksys type and is used for sending the control
packets unique to them.
+
+Security Events Framework
+-------------------------
+ * Asterisk has a new C API for reporting security events. The module res_security_log
+ sends these events to the "security" logger level. Currently, AMI is the only
+ Asterisk component that reports security events. However, SIP support will be
+ coming soon. For more information on the security events framework, see the
+ "Security Events" chapter of the included documentation - doc/tex/asterisk.pdf.
------------------------------------------------------------------------------
--- Functionality changes from Asterisk 1.6.1 to Asterisk 1.6.2 -------------
Modified: team/snuffy/ao2_jabber_take2/Makefile
URL: http://svn.asterisk.org/svn-view/asterisk/team/snuffy/ao2_jabber_take2/Makefile?view=diff&rev=209956&r1=209955&r2=209956
==============================================================================
--- team/snuffy/ao2_jabber_take2/Makefile (original)
+++ team/snuffy/ao2_jabber_take2/Makefile Sat Aug 1 18:07:57 2009
@@ -13,29 +13,23 @@
# All Makefiles use the following variables:
#
-# ASTCFLAGS - compiler options
-# ASTLDFLAGS - linker flags (not libraries)
+# ASTCFLAGS - compiler options provided by the user (if any)
+# _ASTCFLAGS - compiler options provided by the build system
+# ASTLDFLAGS - linker flags (not libraries) provided by the user (if any)
+# _ASTLDFLAGS - linker flags (not libraries) provided by the build system
# LIBS - additional libraries, at top-level for all links,
# on a single object just for that object
# SOLINK - linker flags used only for creating shared objects (.so files),
# used for all .so links
#
-# Initial values for ASTCFLAGS and ASTLDFLAGS can be specified in the
+# Values for ASTCFLAGS and ASTLDFLAGS can be specified in the
# environment when running make, as follows:
#
# $ ASTCFLAGS="-Werror" make ...
#
-# note that this is different from
+# or as a variable value on the make command line itself:
#
# $ make ASTCFLAGS="-Werror" ...
-#
-# If you need to pass compiler/linker flags as 'make' variables, please use
-#
-# $ make COPTS="..." LDOPTS="..." ...
-#
-#
-# You can add the path of local module subdirs from the command line with
-# make LOCAL_MOD_SUBDIRS= ....
export ASTTOPDIR # Top level dir, used in subdirs' Makefiles
export ASTERISKVERSION
@@ -107,7 +101,7 @@
ASTLDFLAGS+=$(LDOPTS)
# libxml2 cflags
-ASTCFLAGS+=$(LIBXML2_INCLUDE)
+_ASTCFLAGS+=$(LIBXML2_INCLUDE)
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
@@ -174,7 +168,7 @@
HTTP_CGIDIR=/var/www/cgi-bin
# Uncomment this to use the older DSP routines
-#ASTCFLAGS+=-DOLD_DSP_ROUTINES
+#_ASTCFLAGS+=-DOLD_DSP_ROUTINES
# If the file .asterisk.makeopts is present in your home directory, you can
# include all of your favorite menuselect options so that every time you download
@@ -224,59 +218,58 @@
endif
endif
-ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
- ifeq ($(findstring -pipe,$(ASTCFLAGS)),)
- ASTCFLAGS+=-pipe
+ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+ ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+ _ASTCFLAGS+=-pipe
endif
endif
-ifeq ($(findstring -Wall,$(ASTCFLAGS)),)
- ASTCFLAGS+=-Wall
-endif
-
-ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
+ifeq ($(findstring -Wall,$(_ASTCFLAGS) $(ASTCFLAGS)),)
+ _ASTCFLAGS+=-Wall
+endif
+
+_ASTCFLAGS+=-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
ifeq ($(AST_DEVMODE),yes)
- ASTCFLAGS+=-Werror
- ASTCFLAGS+=-Wunused
- ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
- ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
- ASTCFLAGS+=-Wundef
- ASTCFLAGS+=-Wmissing-format-attribute
- ASTCFLAGS+=-Wformat=2
+ _ASTCFLAGS+=-Werror
+ _ASTCFLAGS+=-Wunused
+ _ASTCFLAGS+=$(AST_DECLARATION_AFTER_STATEMENT)
+ _ASTCFLAGS+=$(AST_FORTIFY_SOURCE)
+ _ASTCFLAGS+=-Wundef
+ _ASTCFLAGS+=-Wmissing-format-attribute
+ _ASTCFLAGS+=-Wformat=2
endif
ifneq ($(findstring BSD,$(OSARCH)),)
- ASTCFLAGS+=-I/usr/local/include
- ASTLDFLAGS+=-L/usr/local/lib
-endif
-
-ifeq ($(findstring -march,$(ASTCFLAGS)),)
+ _ASTCFLAGS+=-I/usr/local/include
+endif
+
+ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifneq ($(PROC),ultrasparc)
- ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
+ _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
endif
endif
ifeq ($(PROC),ppc)
- ASTCFLAGS+=-fsigned-char
+ _ASTCFLAGS+=-fsigned-char
endif
ifeq ($(OSARCH),FreeBSD)
# -V is understood by BSD Make, not by GNU make.
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)
+ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
endif
ifeq ($(OSARCH),NetBSD)
- ASTCFLAGS+=-pthread -I/usr/pkg/include
+ _ASTCFLAGS+=-pthread -I/usr/pkg/include
endif
ifeq ($(OSARCH),OpenBSD)
- ASTCFLAGS+=-pthread -ftrampolines
+ _ASTCFLAGS+=-pthread -ftrampolines
endif
ifeq ($(OSARCH),SunOS)
- ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
+ _ASTCFLAGS+=-Wcast-align -DSOLARIS -I../include/solaris-compat -I/opt/ssl/include -I/usr/local/ssl/include -D_XPG4_2
endif
ASTERISKVERSION:=$(shell GREP=$(GREP) AWK=$(AWK) build_tools/make_version .)
@@ -289,11 +282,9 @@
ASTERISKVERSIONNUM:=999999
endif
-# XXX MALLOC_DEBUG is probably unused, Makefile.moddir_rules adds the
-# value directly to ASTCFLAGS
-ASTCFLAGS+=$(MALLOC_DEBUG)$(OPTIONS)
-
-MOD_SUBDIRS:=channels pbx apps codecs formats cdr cel bridges funcs tests main res $(LOCAL_MOD_SUBDIRS)
+_ASTCFLAGS+=$(OPTIONS)
+
+MOD_SUBDIRS:=channels pbx apps codecs formats cdr cel bridges funcs tests main res addons $(LOCAL_MOD_SUBDIRS)
OTHER_SUBDIRS:=utils agi
SUBDIRS:=$(OTHER_SUBDIRS) $(MOD_SUBDIRS)
SUBDIRS_INSTALL:=$(SUBDIRS:%=%-install)
@@ -306,13 +297,13 @@
MOD_SUBDIRS_MENUSELECT_TREE:=$(MOD_SUBDIRS:%=%-menuselect-tree)
ifneq ($(findstring darwin,$(OSARCH)),)
- ASTCFLAGS+=-D__Darwin__
+ _ASTCFLAGS+=-D__Darwin__
SOLINK=-bundle -undefined suppress -force_flat_namespace
else
# These are used for all but Darwin
SOLINK=-shared
ifneq ($(findstring BSD,$(OSARCH)),)
- LDFLAGS+=-L/usr/local/lib
+ _ASTLDFLAGS+=-L/usr/local/lib
endif
endif
@@ -415,10 +406,10 @@
endif
$(MOD_SUBDIRS):
- + at ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @_ASTCFLAGS="$(MOD_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
$(OTHER_SUBDIRS):
- + at ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(ASTCFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
+ @_ASTCFLAGS="$(OTHER_SUBDIR_CFLAGS) $(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS)" _ASTLDFLAGS="$(_ASTLDFLAGS)" ASTLDFLAGS="$(ASTLDFLAGS)" $(SUBMAKE) --no-builtin-rules -C $@ SUBDIR=$@ all
defaults.h: makeopts
@build_tools/make_defaults_h > $@.tmp
@@ -476,7 +467,7 @@
rm -f build_tools/menuselect-deps
datafiles: _all
- if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
+ if [ x`$(ID) -un` = xroot ]; then CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" bash build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
# Should static HTTP be installed during make samples or even with its own target ala
# webvoicemail? There are portions here that *could* be customized but might also be
# improved a lot. I'll put it here for now.
Modified: team/snuffy/ao2_jabber_take2/Makefile.moddir_rules
URL: http://svn.asterisk.org/svn-view/asterisk/team/snuffy/ao2_jabber_take2/Makefile.moddir_rules?view=diff&rev=209956&r1=209955&r2=209956
==============================================================================
--- team/snuffy/ao2_jabber_take2/Makefile.moddir_rules (original)
+++ team/snuffy/ao2_jabber_take2/Makefile.moddir_rules Sat Aug 1 18:07:57 2009
@@ -19,7 +19,7 @@
# repeat the left hand side to set multiple variables.
ifeq ($(findstring LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
- ASTCFLAGS+=${GC_CFLAGS}
+ _ASTCFLAGS+=${GC_CFLAGS}
endif
ifneq ($(findstring STATIC_BUILD,$(MENUSELECT_CFLAGS)),)
@@ -38,19 +38,18 @@
ifneq ($(MODULE_PREFIX),)
ALL_C_MODS:=
+ ALL_CC_MODS:=
ALL_C_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.c,%,$(wildcard $(p)_*.c)))
- ALL_CC_MODS:=
ALL_CC_MODS+=$(foreach p,$(MODULE_PREFIX),$(patsubst %.cc,%,$(wildcard $(p)_*.cc)))
+endif
- C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
- CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
+C_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_C_MODS))
+CC_MODS:=$(filter-out $(MENUSELECT_$(MENUSELECT_CATEGORY)),$(ALL_CC_MODS))
- # and store in the list of embedded or loadable modules
- ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
- EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
- else
- LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
- endif
+ifneq ($(findstring $(MENUSELECT_CATEGORY),$(MENUSELECT_EMBED)),)
+ EMBEDDED_MODS:=$(C_MODS) $(CC_MODS)
+else
+ LOADABLE_MODS:=$(C_MODS) $(CC_MODS)
endif
# Both C++ and C++ sources need their module name in AST_MODULE
@@ -58,18 +57,18 @@
# (they are stored in file 'makeopts')
$(addsuffix .oo,$(CC_MODS)) $(addsuffix .o,$(C_MODS)): \
- ASTCFLAGS+= -DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
+ _ASTCFLAGS+= -DAST_MODULE=\"$*\" $(MENUSELECT_OPTS_$*:%=-D%) $(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_INCLUDE))
ifeq ($(findstring $(OSARCH), mingw32 cygwin ),)
# don't define -fPIC on mingw32 and cygwin, it is the default
- $(LOADABLE_MODS:%=%.so): ASTCFLAGS+=-fPIC
+ $(LOADABLE_MODS:%=%.so): _ASTCFLAGS+=-fPIC
endif
# For loadable modules, pass _LIB and _LDFLAGS from menuselect.
$(LOADABLE_MODS:%=%.so): LIBS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LIB))
-$(LOADABLE_MODS:%=%.so): ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
+$(LOADABLE_MODS:%=%.so): _ASTLDFLAGS+=$(foreach dep,$(MENUSELECT_DEPENDS_$*),$(value $(dep)_LDFLAGS))
-$(EMBEDDED_MODS:%=%.o): ASTCFLAGS+=-DEMBEDDED_MODULE=$*
+$(EMBEDDED_MODS:%=%.o): _ASTCFLAGS+=-DEMBEDDED_MODULE=$*
$(addsuffix .so,$(filter $(LOADABLE_MODS),$(C_MODS))): %.so: %.o
$(addsuffix .so,$(filter $(LOADABLE_MODS),$(CC_MODS))): %.so: %.oo
Modified: team/snuffy/ao2_jabber_take2/Makefile.rules
URL: http://svn.asterisk.org/svn-view/asterisk/team/snuffy/ao2_jabber_take2/Makefile.rules?view=diff&rev=209956&r1=209955&r2=209956
==============================================================================
--- team/snuffy/ao2_jabber_take2/Makefile.rules (original)
+++ team/snuffy/ao2_jabber_take2/Makefile.rules Sat Aug 1 18:07:57 2009
@@ -38,26 +38,20 @@
OPTIMIZE?=-O6
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
-
- ASTCFLAGS+=$(OPTIMIZE)
+ _ASTCFLAGS+=$(OPTIMIZE)
endif
# shortcuts for common combinations of flags; these must be recursively expanded so that
# per-target settings will be applied
-CC_CFLAGS=$(PTHREAD_CFLAGS) $(ASTCFLAGS)
-CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(ASTCFLAGS))
+CC_CFLAGS=$(PTHREAD_CFLAGS) $(_ASTCFLAGS) $(ASTCFLAGS)
+CXX_CFLAGS=$(PTHREAD_CFLAGS) $(filter-out -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(AST_DECLARATION_AFTER_STATEMENT),$(_ASTCFLAGS) $(ASTCFLAGS))
ifeq ($(GNU_LD),1)
SO_SUPPRESS_SYMBOLS=-Wl,--version-script,$(if $(wildcard $(subst .so,.exports,$@)),$(subst .so,.exports,$@),$(ASTTOPDIR)/default.exports)
endif
-CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS)
-CXX_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS)
+CC_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS) $(ASTLDFLAGS)
+CXX_LDFLAGS_SO=$(PTHREAD_CFLAGS) $(_ASTLDFLAGS) $(SOLINK) $(SO_SUPPRESS_SYMBOLS) $(ASTLDFLAGS)
CC_LIBS=$(PTHREAD_LIBS) $(LIBS)
CXX_LIBS=$(PTHREAD_LIBS) $(LIBS)
@@ -73,43 +67,43 @@
%.o: %.s
$(ECHO_PREFIX) echo " [AS] $< -> $@"
ifeq ($(COMPILE_DOUBLE),yes)
- $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+ $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(OPTIMIZE) $(CC_CFLAGS)
endif
$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
%.o: %.i
$(ECHO_PREFIX) echo " [CCi] $< -> $@"
ifeq ($(COMPILE_DOUBLE),yes)
- $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(CC_CFLAGS) $(OPTIMIZE)
+ $(CMD_PREFIX) $(CC) -o /dev/null -c $< $(OPTIMIZE) $(CC_CFLAGS)
endif
$(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS)
ifneq ($(COMPILE_DOUBLE),yes)
%.o: %.c
$(ECHO_PREFIX) echo " [CC] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -c $< $(CC_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CC) -o $@ -c $< $(MAKE_DEPS) $(CC_CFLAGS)
endif
%.i: %.c
$(ECHO_PREFIX) echo " [CPP] $< -> $@"
- $(CMD_PREFIX) $(CC) -o $@ -E $< $(CC_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CC) -o $@ -E $< $(MAKE_DEPS) $(CC_CFLAGS)
%.oo: %.ii
$(ECHO_PREFIX) echo " [CXXi] $< -> $@"
ifeq ($(COMPILE_DOUBLE),yes)
- $(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(CXX_CFLAGS) $(OPTIMIZE)
+ $(CMD_PREFIX) $(CXX) -o /dev/null -c $< $(OPTIMIZE) $(CXX_CFLAGS)
endif
$(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS)
ifneq ($(COMPILE_DOUBLE),yes)
%.oo: %.cc
$(ECHO_PREFIX) echo " [CXX] $< -> $@"
- $(CMD_PREFIX) $(CXX) -o $@ -c $< $(CXX_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CXX) -o $@ -c $< $(MAKE_DEPS) $(CXX_CFLAGS)
endif
%.ii: %.cc
$(ECHO_PREFIX) echo " [CPP] $< -> $@"
- $(CMD_PREFIX) $(CXX) -o $@ -E $< $(CXX_CFLAGS) $(MAKE_DEPS)
+ $(CMD_PREFIX) $(CXX) -o $@ -E $< $(MAKE_DEPS) $(CXX_CFLAGS)
%.so: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
@@ -133,6 +127,6 @@
%: %.o
$(ECHO_PREFIX) echo " [LD] $^ -> $@"
[... 17455 lines stripped ...]
More information about the svn-commits
mailing list