Author: mikej Date: Thu Apr 19 18:28:01 2007 New Revision: 4979 Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile.in freeswitch/trunk/libs/sofia-sip/utils/Doxyfile.in Removed: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile freeswitch/trunk/libs/sofia-sip/utils/Doxyfile freeswitch/trunk/libs/sofia-sip/utils/Doxyfile.build.in Modified: freeswitch/trunk/libs/sofia-sip/configure.ac freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am freeswitch/trunk/libs/sofia-sip/utils/Makefile.am freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c freeswitch/trunk/libs/sofia-sip/utils/sip-options.c Log: switch doxygen generation in sofia-sip around to use configure generated files. This should avoid some problems with warnings and errors when builing the manpages. You will probably need to autoreconf and configure sofia-sip for this Modified: freeswitch/trunk/libs/sofia-sip/configure.ac ============================================================================== --- freeswitch/trunk/libs/sofia-sip/configure.ac (original) +++ freeswitch/trunk/libs/sofia-sip/configure.ac Thu Apr 19 18:28:01 2007 @@ -249,31 +249,51 @@ packages/sofia-sip-ua-glib.pc libsofia-sip-ua/Makefile libsofia-sip-ua/bnf/Makefile +libsofia-sip-ua/bnf/Doxyfile libsofia-sip-ua/docs/Makefile +libsofia-sip-ua/docs/Doxyfile libsofia-sip-ua/docs/Doxyfile.version libsofia-sip-ua/docs/sofia-footer.html +libsofia-sip-ua/features/Doxyfile libsofia-sip-ua/features/Makefile +libsofia-sip-ua/http/Doxyfile libsofia-sip-ua/http/Makefile +libsofia-sip-ua/ipt/Doxyfile libsofia-sip-ua/ipt/Makefile +libsofia-sip-ua/iptsec/Doxyfile libsofia-sip-ua/iptsec/Makefile +libsofia-sip-ua/msg/Doxyfile libsofia-sip-ua/msg/Makefile +libsofia-sip-ua/nea/Doxyfile libsofia-sip-ua/nea/Makefile +libsofia-sip-ua/nta/Doxyfile libsofia-sip-ua/nta/Makefile +libsofia-sip-ua/nth/Doxyfile libsofia-sip-ua/nth/Makefile +libsofia-sip-ua/nua/Doxyfile libsofia-sip-ua/nua/Makefile +libsofia-sip-ua/sdp/Doxyfile libsofia-sip-ua/sdp/Makefile +libsofia-sip-ua/sip/Doxyfile libsofia-sip-ua/sip/Makefile +libsofia-sip-ua/soa/Doxyfile libsofia-sip-ua/soa/Makefile +libsofia-sip-ua/sresolv/Doxyfile libsofia-sip-ua/sresolv/Makefile +libsofia-sip-ua/stun/Doxyfile libsofia-sip-ua/stun/Makefile +libsofia-sip-ua/su/Doxyfile libsofia-sip-ua/su/Makefile +libsofia-sip-ua/tport/Doxyfile libsofia-sip-ua/tport/Makefile +libsofia-sip-ua/url/Doxyfile libsofia-sip-ua/url/Makefile libsofia-sip-ua/features/sofia-sip/sofia_features.h libsofia-sip-ua-glib/Makefile libsofia-sip-ua-glib/su-glib/Makefile +libsofia-sip-ua-glib/su-glib/Doxyfile utils/Makefile -utils/Doxyfile.build +utils/Doxyfile win32/Makefile win32/config.h ]) Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am Thu Apr 19 18:28:01 2007 @@ -32,8 +32,7 @@ docs/Doxyfile.version doxygen: built-sources - @cd ${srcdir} ;\ - mkdir -p docs docs/html &&\ + @mkdir -p docs docs/html &&\ for d in $(DIST_SUBDIRS) $(DIST_SUBDIRS); do \ test -r $$d/Doxyfile \ && pushd $$d > /dev/null \ @@ -41,7 +40,7 @@ && ${DOXYGEN} \ && popd > /dev/null ; \ done - cd ${srcdir}/docs/html && ../../${top_srcdir}/libsofia-sip-ua/docs/hide_emails.sh + ${top_srcdir}/libsofia-sip-ua/docs/hide_emails.sh docs/html include $(top_srcdir)/rules/recursive.am Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,12 @@ +PROJECT_NAME = "sofia-sip/su-glib" + +OUTPUT_DIRECTORY = ../docs/html/su-glib + +INPUT = @srcdir@/su_glib.docs @srcdir@ . @srcdir@/sofia-sip + +@INCLUDE_PATH = @srcdir@ . +@INCLUDE = ../docs/Doxyfile.conf + +GENERATE_TAGFILE = ../docs/su_glib.doxytags + +ALIASES += Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/Makefile.am Thu Apr 19 18:28:01 2007 @@ -59,7 +59,6 @@ doxygen: built-sources @echo Generating empty doxytags - cd ${srcdir}; \ mkdir -p docs/html ; \ for d in $(DIST_SUBDIRS); do \ test -r $$d/Doxyfile || continue ; \ @@ -71,20 +70,18 @@ mv -f docs/$$d.doxytags.tmp docs/$$d.doxytags ; \ fi ; \ done - @cd ${srcdir} ;\ for d in $(DIST_SUBDIRS); do \ test -r $$d/Doxyfile \ && pushd $$d > /dev/null \ && echo running ${DOXYGEN} first time in $$d \ && ${DOXYGEN} 2>&1 \ - | egrep -v -i -e 'Warning: (unsupported (xml/)?html tag|unable to resolve reference|could not be resolved)' \ + | egrep -v -i -e 'Warning: (unsupported (xml/)?html tag|unable to resolve reference|explicit link.*could not be resolved)' \ ; popd > /dev/null ; \ test -r docs/$$d.doxytags && \ sed '2,10s!<name>index</name>!<name>'$$d'_index</name>!' \ docs/$$d.doxytags > docs/$$d.doxytags.tmp && \ mv -f docs/$$d.doxytags.tmp docs/$$d.doxytags ; \ done - @cd ${srcdir} ;\ for d in $(DIST_SUBDIRS); do \ test -r $$d/Doxyfile \ && pushd $$d > /dev/null \ @@ -97,6 +94,6 @@ docs/$$d.doxytags > docs/$$d.doxytags.tmp && \ mv -f docs/$$d.doxytags.tmp docs/$$d.doxytags ; \ done - cd ${srcdir}/docs/html && ../hide_emails.sh + ${srcdir}/docs/hide_emails.sh docs/html .PHONY: built-sources built-sources-am empty-doxytags doxygen Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,15 @@ +PROJECT_NAME = "bnf" +OUTPUT_DIRECTORY = ../docs/html/bnf + +INPUT = @srcdir@/bnf.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/su.doxytags=../su + +GENERATE_TAGFILE = ../docs/bnf.doxytags + +PREDEFINED += "static=" + +MAX_INITIALIZER_LINES = 2 Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am Thu Apr 19 18:28:01 2007 @@ -33,7 +33,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile bnf.docs +EXTRA_DIST = bnf.docs # ---------------------------------------------------------------------- # Tests Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf Thu Apr 19 18:28:01 2007 @@ -62,5 +62,3 @@ EXCLUDE_PATTERNS = acconfig.h config.h confdefs.h \ test*.h test*.c torture*.c *test.c *torture.c \ *_tag_dll.c *_tag_ref.c - -IMAGE_PATH = ../../libsofia-sip-ua/docs/pictures Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,31 @@ +PROJECT_NAME = "libsofia-sip-ua" +OUTPUT_DIRECTORY = ../docs/html + +INPUT = @srcdir@/mainpage.docs @srcdir@/docguide.docs @srcdir@/conformance.docs + +# release.docs + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +GENERATE_TAGFILE = docs.doxytags + +TAGFILES = +TAGFILES += su.doxytags=su +TAGFILES += ipt.doxytags=ipt +TAGFILES += bnf.doxytags=bnf +TAGFILES += url.doxytags=url +TAGFILES += msg.doxytags=msg +TAGFILES += sip.doxytags=sip +TAGFILES += sresolv.doxytags=sresolv +TAGFILES += stun.doxytags=stun +TAGFILES += tport.doxytags=tport +TAGFILES += nta.doxytags=nta +TAGFILES += iptsec.doxytags=iptsec +TAGFILES += sdp.doxytags=sdp +TAGFILES += soa.doxytags=soa +TAGFILES += nea.doxytags=nea +TAGFILES += nua.doxytags=nua +TAGFILES += features.doxytags=features + +EXAMPLE_PATH = @srcdir@/../sip Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in Thu Apr 19 18:28:01 2007 @@ -1 +1,3 @@ PROJECT_NUMBER = @VERSION@ + +IMAGE_PATH = @top_srcdir@/libsofia-sip-ua/docs/pictures Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am Thu Apr 19 18:28:01 2007 @@ -1,9 +1,7 @@ -EXTRA_DIST = Doxyfile Doxyfile.aliases Doxyfile.conf \ +EXTRA_DIST = Doxyfile.aliases Doxyfile.conf \ docguide.docs \ mainpage.docs \ conformance.docs \ - Doxyfile.version.in \ - sofia-footer.html.in \ hide_emails.sh \ ChangeLog \ pictures/SIP_basic_incoming_operation.eps \ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh Thu Apr 19 18:28:01 2007 @@ -29,9 +29,9 @@ # # -------------------------------------------------------------------- -find . -name '*.html' -print | while read i ; do - ( - echo "Hiding email addresses in ${i}." - sed -r -i 's/([:>;][a-z][-a-z.]*)(@[a-z][a-z]*)\.[a-z][a-z]*(["<\&])/\1\2-email.address.hidden\3/gi' $i - ) -done +echo "Hiding email addresses in ${1:-.}" + +find ${1:-.} -name '*.html' -print0 | +xargs -0 \ +sed -r -i 's/([:>;][a-z][-a-z.]*)(@[a-z][a-z]*)\.[a-z][a-z]*(["<\&])/\1\2-email.address.hidden\3/gi' + Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,23 @@ +PROJECT_NAME = "features" +OUTPUT_DIRECTORY = ../docs/html/features + +INPUT = @srcdir@/features.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/docs.doxytags=.. +TAGFILES += ../docs/su.doxytags=../su +TAGFILES += ../docs/ipt.doxytags=../ipt +TAGFILES += ../docs/bnf.doxytags=../bnf +TAGFILES += ../docs/url.doxytags=../url +TAGFILES += ../docs/msg.doxytags=../msg +TAGFILES += ../docs/sip.doxytags=../sip +TAGFILES += ../docs/sresolv.doxytags=../sresolv +TAGFILES += ../docs/tport.doxytags=../tport +TAGFILES += ../docs/nta.doxytags=../nta +TAGFILES += ../docs/sdp.doxytags=../sdp + +GENERATE_TAGFILE = ../docs/features.doxytags + +ALIASES += Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am Thu Apr 19 18:28:01 2007 @@ -26,7 +26,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile features.docs +EXTRA_DIST = features.docs # ---------------------------------------------------------------------- # Sofia specific rules Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,19 @@ +PROJECT_NAME = "http" +OUTPUT_DIRECTORY = ../docs/html/http + +INPUT = @srcdir@/http.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += \ + ../docs/su.doxytags=../su \ + ../docs/ipt.doxytags=../ipt \ + ../docs/bnf.doxytags=../bnf \ + ../docs/url.doxytags=../url \ + ../docs/msg.doxytags=../msg + +GENERATE_TAGFILE = ../docs/http.doxytags + +ALIASES += \ + "HTTP_HEADER=@ingroup http_headers\n@defgroup" \ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am Thu Apr 19 18:28:01 2007 @@ -56,7 +56,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile http.docs \ +EXTRA_DIST = http.docs \ sofia-sip/http_protos.h.in \ sofia-sip/http_tag.h.in \ http_parser_table.c.in \ Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,13 @@ +PROJECT_NAME = "ipt" +OUTPUT_DIRECTORY = ../docs/html/ips + +INPUT = @srcdir@/ipt.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/su.doxytags=../su +GENERATE_TAGFILE = ../docs/ipt.doxytags + +ALIASES += + Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am Thu Apr 19 18:28:01 2007 @@ -46,7 +46,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST += Doxyfile ipt.docs +EXTRA_DIST += ipt.docs # ---------------------------------------------------------------------- # Sofia specific rules Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,26 @@ +PROJECT_NAME = "iptsec" +OUTPUT_DIRECTORY = ../docs/html/iptsec + +INPUT = @srcdir@/iptsec.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf +@INCLUDE = ../sip/sip.doxyaliases + +TAGFILES += ../docs/su.doxytags=../su +TAGFILES += ../docs/ipt.doxytags=../ipt +TAGFILES += ../docs/bnf.doxytags=../bnf +TAGFILES += ../docs/url.doxytags=../url +TAGFILES += ../docs/msg.doxytags=../msg +TAGFILES += ../docs/sip.doxytags=../sip +TAGFILES += ../docs/http.doxytags=../http +TAGFILES += ../docs/sresolv.doxytags=../sresolv +TAGFILES += ../docs/tport.doxytags=../tport +TAGFILES += ../docs/nta.doxytags=../nta + +GENERATE_TAGFILE = ../docs/iptsec.doxytags + +ALIASES += + +PREDEFINED += SOFIA_EXTEND_AUTH_CLIENT=1 + Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am Thu Apr 19 18:28:01 2007 @@ -78,7 +78,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile iptsec.docs testpasswd $(BUILT_SOURCES) +EXTRA_DIST = iptsec.docs testpasswd $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h Thu Apr 19 18:28:01 2007 @@ -30,7 +30,8 @@ * @brief Client-side plugin interface for authentication * * @note For extensions in 1.12.6 or later, - * you have to #define SOFIA_EXTEND_AUTH_CLIENT to 1. + * you have to define SOFIA_EXTEND_AUTH_CLIENT to 1 + * before including this file. * * @author Pekka Pessi <Pekka.Pessi@nokia.com> * Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,18 @@ +PROJECT_NAME = "msg" +OUTPUT_DIRECTORY = ../docs/html/msg + +INPUT = @srcdir@/msg.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf +@INCLUDE = ../sip/sip.doxyaliases + +TAGFILES += ../docs/ipt.doxytags=../ipt \ + ../docs/su.doxytags=../su \ + ../docs/sip.doxytags=../sip \ + ../docs/nta.doxytags=../nta \ + ../docs/http.doxytags=../http + +GENERATE_TAGFILE = ../docs/msg.doxytags + +IMAGE_PATH += @srcdir@/../sip/images Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am Thu Apr 19 18:28:01 2007 @@ -66,7 +66,7 @@ dist_pkgdata_SCRIPTS = msg_parser.awk -EXTRA_DIST = Doxyfile msg.docs \ +EXTRA_DIST = msg.docs \ sofia-sip/msg_mime_protos.h.in \ sofia-sip/msg_protos.h.in \ msg_mime_table.c.in \ Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,22 @@ +PROJECT_NAME = "nea" +OUTPUT_DIRECTORY = ../docs/html/nea + +INPUT = @srcdir@/nea.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +EXCLUDE_PATTERNS = test*.c torture*.c + +TAGFILES += \ + "../docs/su.doxytags=../su" \ + "../docs/ipt.doxytags=../ipt" \ + "../docs/bnf.doxytags=../bnf" \ + "../docs/url.doxytags=../url" \ + "../docs/msg.doxytags=../msg" \ + "../docs/sip.doxytags=../sip" \ + "../docs/nta.doxytags=../nta" + +GENERATE_TAGFILE = ../docs/nea.doxytags + +ALIASES += Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am Thu Apr 19 18:28:01 2007 @@ -54,7 +54,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile nea.docs $(BUILT_SOURCES) +EXTRA_DIST = nea.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,25 @@ +PROJECT_NAME = "nta" +OUTPUT_DIRECTORY = ../docs/html/nta + +INPUT = @srcdir@/nta.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/su.doxytags=../su +TAGFILES += ../docs/ipt.doxytags=../ipt +TAGFILES += ../docs/bnf.doxytags=../bnf +TAGFILES += ../docs/url.doxytags=../url +TAGFILES += ../docs/msg.doxytags=../msg +TAGFILES += ../docs/sip.doxytags=../sip +TAGFILES += ../docs/sresolv.doxytags=../sresolv +TAGFILES += ../docs/tport.doxytags=../tport + +GENERATE_TAGFILE = ../docs/nta.doxytags + +EXCLUDE_PATTERNS += sl_*.h sl_*.c nta_compat.* + +ALIASES += + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../sip/sip.doxyaliases \ No newline at end of file Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am Thu Apr 19 18:28:01 2007 @@ -66,7 +66,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile nta.docs sl_utils.docs \ +EXTRA_DIST = nta.docs sl_utils.docs \ agent.pem cafile.pem \ invite.msc $(BUILT_SOURCES) Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,19 @@ +PROJECT_NAME = "nth" +OUTPUT_DIRECTORY = ../docs/html/nth + +INPUT = @srcdir@/nth.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += \ + "../docs/su.doxytags=../su" \ + "../docs/ipt.doxytags=../ipt" \ + "../docs/bnf.doxytags=../bnf" \ + "../docs/url.doxytags=../url" \ + "../docs/msg.doxytags=../msg" \ + "../docs/http.doxytags=../http" \ + +GENERATE_TAGFILE = ../docs/nth.doxytags + +ALIASES += Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am Thu Apr 19 18:28:01 2007 @@ -57,7 +57,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile nth.docs $(BUILT_SOURCES) \ +EXTRA_DIST = nth.docs $(BUILT_SOURCES) \ agent.pem cafile.pem # ---------------------------------------------------------------------- Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,39 @@ +PROJECT_NAME = "nua" +OUTPUT_DIRECTORY = ../docs/html/nua + +INPUT = @srcdir@/nua.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/docs.doxytags=../docs +TAGFILES += ../docs/su.doxytags=../su +TAGFILES += ../docs/ipt.doxytags=../ipt +TAGFILES += ../docs/bnf.doxytags=../bnf +TAGFILES += ../docs/url.doxytags=../url +TAGFILES += ../docs/msg.doxytags=../msg +TAGFILES += ../docs/sip.doxytags=../sip +TAGFILES += ../docs/sresolv.doxytags=../sresolv +TAGFILES += ../docs/tport.doxytags=../tport +TAGFILES += ../docs/nta.doxytags=../nta +TAGFILES += ../docs/soa.doxytags=../soa +TAGFILES += ../docs/nea.doxytags=../nea +TAGFILES += ../docs/sdp.doxytags=../sdp + +GENERATE_TAGFILE = ../docs/nua.doxytags + +ALIASES += CFILE="@internal @file" IFILE="@internal @file" + +ALIASES += nua="@ref index \"nua\"" +# When GENERATE_TAGFILE=YES, we should use \ref main +#ALIASES += nua="@ref main \"nua\"" + +ALIASES += NUA_EVENT="@var nua_event_e::" +ALIASES += END_NUA_EVENT="@par " + +ALIASES += \ + NUA_HPARAM_CALLS="nua_invite(), nua_respond(), nua_ack(), nua_prack(), nua_update(), nua_info(), nua_bye(), nua_options(), nua_message(), nua_register(), nua_publish(), nua_refer(),nua_subscribe(), nua_notify(), nua_refer(), nua_notifier()" + +VERBATIM_HEADERS = NO + +@INCLUDE = ../sip/sip.doxyaliases Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am Thu Apr 19 18:28:01 2007 @@ -92,7 +92,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile nua.docs $(BUILT_SOURCES) +EXTRA_DIST = nua.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,12 @@ +PROJECT_NAME = "sdp" +OUTPUT_DIRECTORY = ../docs/html/sdp + +INPUT = @srcdir@/sdp.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/su.doxytags=../su +GENERATE_TAGFILE = ../docs/sdp.doxytags + +ALIASES += Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am Thu Apr 19 18:28:01 2007 @@ -43,7 +43,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile sdp.docs $(BUILT_SOURCES) \ +EXTRA_DIST = sdp.docs $(BUILT_SOURCES) \ tests/message-1.sdp \ tests/message-2.sdp \ tests/message-3.sdp \ Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,31 @@ +PROJECT_NAME = "sip" +OUTPUT_DIRECTORY = ../docs/html/sip + +INPUT = @srcdir@/sofia-sip sofia-sip @srcdir@/sip.docs @srcdir@/sip_parser.docs @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += \ + ../docs/su.doxytags=../su \ + ../docs/ipt.doxytags=../ipt \ + ../docs/bnf.doxytags=../bnf \ + ../docs/url.doxytags=../url \ + ../docs/msg.doxytags=../msg \ + ../docs/sdp.doxytags=../sdp \ + ../docs/iptsec.doxytags=../iptsec \ + ../docs/nta.doxytags=../nta \ + ../docs/nua.doxytags=../nua + +GENERATE_TAGFILE = ../docs/sip.doxytags + +ALIASES += \ + "SIP_TAG=@ingroup sip_tag\n" \ + "SIP_HEADER=@ingroup sip_headers\n@defgroup" \ + "SIP_PARSER=\n" + +@INCLUDE = sip.doxyaliases + +PREDEFINED += SU_HAVE_EXPERIMENTAL=1 + +IMAGE_PATH += @srcdir@/images Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am Thu Apr 19 18:28:01 2007 @@ -69,7 +69,7 @@ # note: srcdir needs to be specified, otherwise # breaks make distcheck target -EXTRA_DIST = Doxyfile sip.docs sip_parser.docs sip.doxyaliases \ +EXTRA_DIST = sip.docs sip_parser.docs sip.doxyaliases \ ADD-A-HEADER GRAMMAR sip_bad_mask \ sip_parser_table.c.in sip_tag.c.in \ sip_extra_headers.txt \ Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,30 @@ +PROJECT_NAME = "soa" +OUTPUT_DIRECTORY = ../docs/html/soa + +INPUT = @srcdir@/soa.docs @srcdir@/sofia-sip/soa.h +INPUT += @srcdir@/sofia-sip/soa_add.h @srcdir@/soa.c +INPUT += @srcdir@/sofia-sip/soa_tag.h @srcdir@/soa_tag.c + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/docs.doxytags=../docs +TAGFILES += ../docs/su.doxytags=../su +TAGFILES += ../docs/ipt.doxytags=../ipt +TAGFILES += ../docs/bnf.doxytags=../bnf +TAGFILES += ../docs/url.doxytags=../url +TAGFILES += ../docs/msg.doxytags=../msg +TAGFILES += ../docs/sip.doxytags=../sip +TAGFILES += ../docs/sresolv.doxytags=../sresolv +TAGFILES += ../docs/tport.doxytags=../tport +TAGFILES += ../docs/nta.doxytags=../nta +TAGFILES += ../docs/sdp.doxytags=../sdp +TAGFILES += ../docs/nua.doxytags=../nua + +GENERATE_TAGFILE = ../docs/soa.doxytags + +ALIASES += soa="@ref index \"soa\"" +# When GENERATE_TAGFILE=YES, we should use \ref main +#ALIASES += soa="@ref main \"soa\"" + +@INCLUDE = ../sip/sip.doxyaliases Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am Thu Apr 19 18:28:01 2007 @@ -53,7 +53,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile soa.docs $(BUILT_SOURCES) +EXTRA_DIST = soa.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,16 @@ +PROJECT_NAME = "sresolv" +OUTPUT_DIRECTORY = ../docs/html/sresolv + +INPUT = @srcdir@/sofia-sip @srcdir@/sofia-resolv @srcdir@/sresolv.docs @srcdir@ + +EXCLUDE = resolve_sip.c + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +ALIASES += CFILE="@internal @file" IFILE="@internal @file" + +TAGFILES += ../docs/su.doxytags=../su +GENERATE_TAGFILE = ../docs/sresolv.doxytags + +PREDEFINED += SRES_CONTEXT_T="struct sres_context_s" \ No newline at end of file Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am Thu Apr 19 18:28:01 2007 @@ -51,7 +51,7 @@ # ---------------------------------------------------------------------- # Distribution -EXTRA_DIST = Doxyfile sresolv.docs +EXTRA_DIST = sresolv.docs dist_noinst_DATA = run_test_sresolv \ root.zone rndc.conf \ Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,11 @@ +PROJECT_NAME = "stun" +OUTPUT_DIRECTORY = ../docs/html/stun + +INPUT = @srcdir@/stun.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/su.doxytags=../su + +GENERATE_TAGFILE = ../docs/stun.doxytags Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am Thu Apr 19 18:28:01 2007 @@ -46,7 +46,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile stun.docs cert.pem key.pem +EXTRA_DIST = stun.docs cert.pem key.pem # ---------------------------------------------------------------------- # Sofia specific rules Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c Thu Apr 19 18:28:01 2007 @@ -98,7 +98,7 @@ * @endcode * * @section stunc_environment Environment - * STUN_DEBUG + * #STUN_DEBUG * * @section stunc_bugs Reporting Bugs * Report bugs to <sofia-sip-devel@lists.sourceforge.net>. Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,25 @@ +PROJECT_NAME = "su" +OUTPUT_DIRECTORY = ../docs/html/su + +INPUT = @srcdir@/su.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/msg.doxytags=../msg +TAGFILES += ../docs/sip.doxytags=../sip +TAGFILES += ../docs/docs.doxytags=.. + +GENERATE_TAGFILE = ../docs/su.doxytags + +ALIASES += "SU_TAG=@ingroup su_tag\n" + +PREDEFINED += \ + TSTFLAGS=1 \ + SU_HAVE_BSDSOCK=0 \ + su_root_s=su_root_t \ + _su_task_r=su_task_r + +EXCLUDE_PATTERNS += localinfo.c addrinfo.c + +@INCLUDE = ../sip/sip.doxyaliases Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am Thu Apr 19 18:28:01 2007 @@ -105,7 +105,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile su.docs \ +EXTRA_DIST = su.docs \ run_addrinfo run_localinfo run_test_su dist_pkgdata_SCRIPTS = tag_dll.awk Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_log.c Thu Apr 19 18:28:01 2007 @@ -63,7 +63,7 @@ * messages based on message priority. * * @sa @ref debug_logs, <sofia-sip/su_log.h>, - * su_llog(), su_vllog(), #su_log_t, #SU_LOG, + * su_llog(), su_vllog(), #su_log_t, #SU_DEBUG, * SU_DEBUG_0(), SU_DEBUG_1(), SU_DEBUG_2(), SU_DEBUG_3(), SU_DEBUG_5(), * SU_DEBUG_7(), SU_DEBUG_9() */ Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c Thu Apr 19 18:28:01 2007 @@ -157,7 +157,7 @@ unsigned char sut_set; /**< Timer is set (inserted in tree) */ }; -/** @internal Timer running status */ +/** Timer running status */ enum sut_running { reset = 0, /**< Timer is not running */ run_at_intervals = 1, /**< Compensate missed wakeup calls */ Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,20 @@ +PROJECT_NAME = "tport" +OUTPUT_DIRECTORY = ../docs/html/tport + +INPUT = @srcdir@/tport.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += \ + ../docs/su.doxytags=../su \ + ../docs/msg.doxytags=../msg \ + ../docs/nth.doxytags=../nth \ + ../docs/nta.doxytags=../nta \ + ../docs/nua.doxytags=../nua \ + +GENERATE_TAGFILE = ../docs/tport.doxytags + +EXCLUDE_PATTERNS += test_*.[hc] torture_*.[hc] + +ALIASES += Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am Thu Apr 19 18:28:01 2007 @@ -80,7 +80,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile tport.docs \ +EXTRA_DIST = tport.docs \ certificates.html agent.pem cafile.pem # ---------------------------------------------------------------------- Added: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,13 @@ +PROJECT_NAME = "url" +OUTPUT_DIRECTORY = ../docs/html/url + +INPUT = @srcdir@/url.docs @srcdir@/sofia-sip @srcdir@ . + +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf + +TAGFILES += ../docs/su.doxytags=../su + +GENERATE_TAGFILE = ../docs/url.doxytags + +PREDEFINED += "URL_DLL" Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am Thu Apr 19 18:28:01 2007 @@ -43,7 +43,7 @@ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile url.docs $(BUILT_SOURCES) +EXTRA_DIST = url.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Tests Added: freeswitch/trunk/libs/sofia-sip/utils/Doxyfile.in ============================================================================== --- (empty file) +++ freeswitch/trunk/libs/sofia-sip/utils/Doxyfile.in Thu Apr 19 18:28:01 2007 @@ -0,0 +1,67 @@ +# +# Template for Doxyfile. +# @configure_input@ +# +# Copyright (C) 2006 Nokia Corporation +# Contact: Pekka Pessi <pekka.pessi@nokia.com> +# Licensed under LGPL. See file COPYING. +# + +PROJECT_NAME = "sofia-sip" + +PROJECT_NUMBER = @VERSION@ + +INPUT = @srcdir@ +INPUT += @top_srcdir@/libsofia-sip-ua/su/localinfo.c +INPUT += @top_srcdir@/libsofia-sip-ua/su/addrinfo.c +INPUT += @top_srcdir@/libsofia-sip-ua/stun/stunc.c + +OUTPUT_DIRECTORY = ../man + +@INCLUDE_PATH = . @srcdir@ + +@INCLUDE = ../libsofia-sip-ua/docs/Doxyfile.aliases +@INCLUDE = ../libsofia-sip-ua/docs/Doxyfile.rfc + +FILE_PATTERNS = *.h *.c + +EXCLUDE_PATTERNS = acconfig.h config.h confdefs.h \ + test*.h test*.c torture*.c *test.c *torture.c \ + *_tag_dll.c *_tag_ref.c + +TAGFILES = + +OUTPUT_LANGUAGE = English + +DETAILS_AT_TOP = YES +OPTIMIZE_OUTPUT_FOR_C = YES +SHOW_USED_FILES = NO + +QUIET = YES +WARNINGS = YES +DISABLE_INDEX = NO + +HAVE_DOT = YES +INCLUDE_GRAPH = NO +INCLUDED_BY_GRAPH = NO + +EXTRACT_ALL = NO +EXTRACT_PRIVATE = NO +HIDE_UNDOC_MEMBERS = YES +HIDE_UNDOC_CLASSES = YES +HIDE_SCOPE_NAMES = YES +BRIEF_MEMBER_DESC = YES +REPEAT_BRIEF = YES +JAVADOC_AUTOBRIEF = YES +MAX_INITIALIZER_LINES = 0 +ENUM_VALUES_PER_LINE = 1 + +ENABLE_PREPROCESSING = NO + +GENERATE_MAN = YES +MAN_OUTPUT = . +MAN_EXTENSION = .1 +MAN_LINKS = NO + +GENERATE_HTML = NO +GENERATE_LATEX = NO Modified: freeswitch/trunk/libs/sofia-sip/utils/Makefile.am ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/Makefile.am (original) +++ freeswitch/trunk/libs/sofia-sip/utils/Makefile.am Thu Apr 19 18:28:01 2007 @@ -44,5 +44,3 @@ bin_PROGRAMS = sip-options sip-date sip-dig LDADD = ../libsofia-sip-ua/libsofia-sip-ua.la $(GLIB_LIBS) - -EXTRA_DIST = Doxyfile Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-dig.c Thu Apr 19 18:28:01 2007 @@ -116,7 +116,7 @@ * @endcode * * @section sip_dig_environment Environment - * SRESOLV_DEBUG, SRESOLV_CONF + * #SRESOLV_DEBUG, SRESOLV_CONF * * @section sip_dig_bugs Reporting Bugs * Report bugs to <sofia-sip-devel@lists.sourceforge.net>. Modified: freeswitch/trunk/libs/sofia-sip/utils/sip-options.c ============================================================================== --- freeswitch/trunk/libs/sofia-sip/utils/sip-options.c (original) +++ freeswitch/trunk/libs/sofia-sip/utils/sip-options.c Thu Apr 19 18:28:01 2007 @@ -77,7 +77,7 @@ * @endcode * * @section environment Environment - * SIPADDRESS, sip_proxy, NTA_DEBUG, TPORT_DEBUG, TPORT_LOG. + * #SIPADDRESS, #sip_proxy, #NTA_DEBUG, #TPORT_DEBUG, #TPORT_LOG. * * @section bugs Reporting Bugs * Report bugs to <sofia-sip-devel@lists.sourceforge.net>.