From d70893d8080b4bf80a6a6f97573b04a8d0809d3d Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 19 Apr 2007 22:28:01 +0000 Subject: [PATCH] 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 git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4979 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- libs/sofia-sip/configure.ac | 22 +++++++++++++++- .../libsofia-sip-ua-glib/Makefile.am | 5 ++-- .../su-glib/{Doxyfile => Doxyfile.in} | 3 ++- libs/sofia-sip/libsofia-sip-ua/Makefile.am | 7 ++---- .../bnf/{Doxyfile => Doxyfile.in} | 3 ++- .../sofia-sip/libsofia-sip-ua/bnf/Makefile.am | 2 +- .../libsofia-sip-ua/docs/Doxyfile.conf | 2 -- .../docs/{Doxyfile => Doxyfile.in} | 5 ++-- .../libsofia-sip-ua/docs/Doxyfile.version.in | 2 ++ .../libsofia-sip-ua/docs/Makefile.am | 4 +-- .../libsofia-sip-ua/docs/hide_emails.sh | 12 ++++----- .../features/{Doxyfile => Doxyfile.in} | 3 ++- .../libsofia-sip-ua/features/Makefile.am | 2 +- .../http/{Doxyfile => Doxyfile.in} | 3 ++- .../libsofia-sip-ua/http/Makefile.am | 2 +- .../ipt/{Doxyfile => Doxyfile.in} | 3 ++- .../sofia-sip/libsofia-sip-ua/ipt/Makefile.am | 2 +- .../iptsec/{Doxyfile => Doxyfile.in} | 4 ++- .../libsofia-sip-ua/iptsec/Makefile.am | 2 +- .../iptsec/sofia-sip/auth_client_plugin.h | 3 ++- .../msg/{Doxyfile => Doxyfile.in} | 5 ++-- .../sofia-sip/libsofia-sip-ua/msg/Makefile.am | 2 +- .../nea/{Doxyfile => Doxyfile.in} | 3 ++- .../sofia-sip/libsofia-sip-ua/nea/Makefile.am | 2 +- .../nta/{Doxyfile => Doxyfile.in} | 4 ++- .../sofia-sip/libsofia-sip-ua/nta/Makefile.am | 2 +- .../nth/{Doxyfile => Doxyfile.in} | 3 ++- .../sofia-sip/libsofia-sip-ua/nth/Makefile.am | 2 +- .../nua/{Doxyfile => Doxyfile.in} | 3 ++- .../sofia-sip/libsofia-sip-ua/nua/Makefile.am | 2 +- .../sdp/{Doxyfile => Doxyfile.in} | 3 ++- .../sofia-sip/libsofia-sip-ua/sdp/Makefile.am | 2 +- .../sip/{Doxyfile => Doxyfile.in} | 5 ++-- .../sofia-sip/libsofia-sip-ua/sip/Makefile.am | 2 +- .../soa/{Doxyfile => Doxyfile.in} | 6 +++-- .../sofia-sip/libsofia-sip-ua/soa/Makefile.am | 2 +- .../sresolv/{Doxyfile => Doxyfile.in} | 3 ++- .../libsofia-sip-ua/sresolv/Makefile.am | 2 +- .../stun/{Doxyfile => Doxyfile.in} | 3 ++- .../libsofia-sip-ua/stun/Makefile.am | 2 +- libs/sofia-sip/libsofia-sip-ua/stun/stunc.c | 2 +- .../su/{Doxyfile => Doxyfile.in} | 5 ++-- libs/sofia-sip/libsofia-sip-ua/su/Makefile.am | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_log.c | 2 +- libs/sofia-sip/libsofia-sip-ua/su/su_timer.c | 2 +- .../tport/{Doxyfile => Doxyfile.in} | 3 ++- .../libsofia-sip-ua/tport/Makefile.am | 2 +- .../url/{Doxyfile => Doxyfile.in} | 3 ++- .../sofia-sip/libsofia-sip-ua/url/Makefile.am | 2 +- libs/sofia-sip/utils/Doxyfile.build.in | 22 ---------------- .../sofia-sip/utils/{Doxyfile => Doxyfile.in} | 25 ++++++++++++++++++- libs/sofia-sip/utils/Makefile.am | 2 -- libs/sofia-sip/utils/sip-dig.c | 2 +- libs/sofia-sip/utils/sip-options.c | 2 +- 54 files changed, 131 insertions(+), 94 deletions(-) rename libs/sofia-sip/libsofia-sip-ua-glib/su-glib/{Doxyfile => Doxyfile.in} (67%) rename libs/sofia-sip/libsofia-sip-ua/bnf/{Doxyfile => Doxyfile.in} (73%) rename libs/sofia-sip/libsofia-sip-ua/docs/{Doxyfile => Doxyfile.in} (85%) rename libs/sofia-sip/libsofia-sip-ua/features/{Doxyfile => Doxyfile.in} (87%) rename libs/sofia-sip/libsofia-sip-ua/http/{Doxyfile => Doxyfile.in} (79%) rename libs/sofia-sip/libsofia-sip-ua/ipt/{Doxyfile => Doxyfile.in} (69%) rename libs/sofia-sip/libsofia-sip-ua/iptsec/{Doxyfile => Doxyfile.in} (85%) rename libs/sofia-sip/libsofia-sip-ua/msg/{Doxyfile => Doxyfile.in} (71%) rename libs/sofia-sip/libsofia-sip-ua/nea/{Doxyfile => Doxyfile.in} (83%) rename libs/sofia-sip/libsofia-sip-ua/nta/{Doxyfile => Doxyfile.in} (80%) rename libs/sofia-sip/libsofia-sip-ua/nth/{Doxyfile => Doxyfile.in} (80%) rename libs/sofia-sip/libsofia-sip-ua/nua/{Doxyfile => Doxyfile.in} (93%) rename libs/sofia-sip/libsofia-sip-ua/sdp/{Doxyfile => Doxyfile.in} (71%) rename libs/sofia-sip/libsofia-sip-ua/sip/{Doxyfile => Doxyfile.in} (79%) rename libs/sofia-sip/libsofia-sip-ua/soa/{Doxyfile => Doxyfile.in} (81%) rename libs/sofia-sip/libsofia-sip-ua/sresolv/{Doxyfile => Doxyfile.in} (63%) rename libs/sofia-sip/libsofia-sip-ua/stun/{Doxyfile => Doxyfile.in} (67%) rename libs/sofia-sip/libsofia-sip-ua/su/{Doxyfile => Doxyfile.in} (76%) rename libs/sofia-sip/libsofia-sip-ua/tport/{Doxyfile => Doxyfile.in} (81%) rename libs/sofia-sip/libsofia-sip-ua/url/{Doxyfile => Doxyfile.in} (71%) delete mode 100644 libs/sofia-sip/utils/Doxyfile.build.in rename libs/sofia-sip/utils/{Doxyfile => Doxyfile.in} (59%) diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac index 55161c40e5..a30b37ec01 100644 --- a/libs/sofia-sip/configure.ac +++ b/libs/sofia-sip/configure.ac @@ -249,31 +249,51 @@ packages/sofia-sip-ua.pc 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 ]) diff --git a/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am b/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am index 25491ef500..f2612b6e2d 100644 --- a/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua-glib/Makefile.am @@ -32,8 +32,7 @@ EXTRA_DIST = docs/Doxyfile.aliases \ 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: built-sources && ${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 diff --git a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile.in similarity index 67% rename from libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile.in index 3500ac5571..b0afbb73f2 100644 --- a/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua-glib/su-glib/Doxyfile.in @@ -2,8 +2,9 @@ PROJECT_NAME = "sofia-sip/su-glib" OUTPUT_DIRECTORY = ../docs/html/su-glib -INPUT = su_glib.docs . sofia-sip +INPUT = @srcdir@/su_glib.docs @srcdir@ . @srcdir@/sofia-sip +@INCLUDE_PATH = @srcdir@ . @INCLUDE = ../docs/Doxyfile.conf GENERATE_TAGFILE = ../docs/su_glib.doxytags diff --git a/libs/sofia-sip/libsofia-sip-ua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/Makefile.am index 4c46c8833c..f50d1d9513 100644 --- a/libs/sofia-sip/libsofia-sip-ua/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/Makefile.am @@ -59,7 +59,6 @@ include $(top_srcdir)/rules/recursive.am 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 @@ doxygen: built-sources 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!index!'$$d'_index!' \ 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 @@ doxygen: built-sources 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 diff --git a/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile.in similarity index 73% rename from libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile.in index 4d09dd9671..bca76a1aaa 100644 --- a/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/bnf/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "bnf" OUTPUT_DIRECTORY = ../docs/html/bnf -INPUT = bnf.docs sofia-sip . +INPUT = @srcdir@/bnf.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/su.doxytags=../su diff --git a/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am index 5fc5406f87..569e517a26 100644 --- a/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/bnf/Makefile.am @@ -33,7 +33,7 @@ torture_bnf_LDFLAGS = -static # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile bnf.docs +EXTRA_DIST = bnf.docs # ---------------------------------------------------------------------- # Tests diff --git a/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf b/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf index fd417ee732..d3097c7332 100644 --- a/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf +++ b/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.conf @@ -62,5 +62,3 @@ 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 - -IMAGE_PATH = ../../libsofia-sip-ua/docs/pictures diff --git a/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.in similarity index 85% rename from libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.in index 5b1e67c614..77a21b4886 100644 --- a/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.in @@ -1,10 +1,11 @@ PROJECT_NAME = "libsofia-sip-ua" OUTPUT_DIRECTORY = ../docs/html -INPUT = mainpage.docs docguide.docs conformance.docs +INPUT = @srcdir@/mainpage.docs @srcdir@/docguide.docs @srcdir@/conformance.docs # release.docs +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf GENERATE_TAGFILE = docs.doxytags @@ -27,4 +28,4 @@ TAGFILES += nea.doxytags=nea TAGFILES += nua.doxytags=nua TAGFILES += features.doxytags=features -EXAMPLE_PATH = ../sip +EXAMPLE_PATH = @srcdir@/../sip diff --git a/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in b/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in index 174d1d894b..2fc743cfdf 100644 --- a/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in +++ b/libs/sofia-sip/libsofia-sip-ua/docs/Doxyfile.version.in @@ -1 +1,3 @@ PROJECT_NUMBER = @VERSION@ + +IMAGE_PATH = @top_srcdir@/libsofia-sip-ua/docs/pictures diff --git a/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am index 112632432d..7549937885 100644 --- a/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/docs/Makefile.am @@ -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 \ diff --git a/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh b/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh index 35e52d854d..c82261934c 100644 --- a/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh +++ b/libs/sofia-sip/libsofia-sip-ua/docs/hide_emails.sh @@ -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' + diff --git a/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile.in similarity index 87% rename from libs/sofia-sip/libsofia-sip-ua/features/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/features/Doxyfile.in index 2ffd7e46b7..ad72360a20 100644 --- a/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/features/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "features" OUTPUT_DIRECTORY = ../docs/html/features -INPUT = features.docs sofia-sip . +INPUT = @srcdir@/features.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/docs.doxytags=.. diff --git a/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am index 8f96fb05c6..eefbfaaffe 100644 --- a/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/features/Makefile.am @@ -26,7 +26,7 @@ libfeatures_la_SOURCES = features.c # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile features.docs +EXTRA_DIST = features.docs # ---------------------------------------------------------------------- # Sofia specific rules diff --git a/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile.in similarity index 79% rename from libs/sofia-sip/libsofia-sip-ua/http/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/http/Doxyfile.in index 765ea5117f..eb4fca4ee3 100644 --- a/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/http/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "http" OUTPUT_DIRECTORY = ../docs/html/http -INPUT = http.docs sofia-sip . +INPUT = @srcdir@/http.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += \ diff --git a/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am index a9bc00d691..808b6f639a 100644 --- a/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/http/Makefile.am @@ -56,7 +56,7 @@ test_http_LDFLAGS = -static # ---------------------------------------------------------------------- # 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 \ diff --git a/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile.in similarity index 69% rename from libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile.in index 736755d7b9..7b06ed5984 100644 --- a/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/ipt/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "ipt" OUTPUT_DIRECTORY = ../docs/html/ips -INPUT = ipt.docs sofia-sip . +INPUT = @srcdir@/ipt.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/su.doxytags=../su diff --git a/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am index 90c7cc242b..1f8b2e927c 100644 --- a/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/ipt/Makefile.am @@ -46,7 +46,7 @@ torture_base64_LDFLAGS = -static # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST += Doxyfile ipt.docs +EXTRA_DIST += ipt.docs # ---------------------------------------------------------------------- # Sofia specific rules diff --git a/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile.in similarity index 85% rename from libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile.in index bc16f9cfed..a22287378d 100644 --- a/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/iptsec/Doxyfile.in @@ -1,9 +1,11 @@ PROJECT_NAME = "iptsec" OUTPUT_DIRECTORY = ../docs/html/iptsec -INPUT = iptsec.docs sofia-sip . +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 diff --git a/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am index aa3424098d..ed2129f820 100644 --- a/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/iptsec/Makefile.am @@ -78,7 +78,7 @@ EXTRA_libiptsec_la_SOURCES = \ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile iptsec.docs testpasswd $(BUILT_SOURCES) +EXTRA_DIST = iptsec.docs testpasswd $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules diff --git a/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h b/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h index a87a2bb9e9..29924b7dab 100644 --- a/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h +++ b/libs/sofia-sip/libsofia-sip-ua/iptsec/sofia-sip/auth_client_plugin.h @@ -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 * diff --git a/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile.in similarity index 71% rename from libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile.in index c200701066..e51c2f942b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/msg/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "msg" OUTPUT_DIRECTORY = ../docs/html/msg -INPUT = msg.docs . sofia-sip +INPUT = @srcdir@/msg.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf @INCLUDE = ../sip/sip.doxyaliases @@ -14,4 +15,4 @@ TAGFILES += ../docs/ipt.doxytags=../ipt \ GENERATE_TAGFILE = ../docs/msg.doxytags -IMAGE_PATH += ../sip/images +IMAGE_PATH += @srcdir@/../sip/images diff --git a/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am index 14a341bb91..441e99bd7b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/msg/Makefile.am @@ -66,7 +66,7 @@ msg_name_hash_LDFLAGS = -static 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 \ diff --git a/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile.in similarity index 83% rename from libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile.in index a24941f37d..484147fbc2 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/nea/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "nea" OUTPUT_DIRECTORY = ../docs/html/nea -INPUT = nea.docs sofia-sip . +INPUT = @srcdir@/nea.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf EXCLUDE_PATTERNS = test*.c torture*.c diff --git a/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am index 5b27b9252e..43b4cce918 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nea/Makefile.am @@ -54,7 +54,7 @@ LDADD = libnea.la \ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile nea.docs $(BUILT_SOURCES) +EXTRA_DIST = nea.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile.in similarity index 80% rename from libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile.in index 866955d9cc..58f9789d7e 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "nta" OUTPUT_DIRECTORY = ../docs/html/nta -INPUT = nta.docs sofia-sip . +INPUT = @srcdir@/nta.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/su.doxytags=../su @@ -20,4 +21,5 @@ EXCLUDE_PATTERNS += sl_*.h sl_*.c nta_compat.* ALIASES += +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../sip/sip.doxyaliases \ No newline at end of file diff --git a/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am index ac86e31c6b..364823c6ab 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nta/Makefile.am @@ -66,7 +66,7 @@ MOSTLYCLEANFILES += .test[0-9]* # ---------------------------------------------------------------------- # 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) diff --git a/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile.in similarity index 80% rename from libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile.in index ef81f26bbf..7b287c0cad 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/nth/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "nth" OUTPUT_DIRECTORY = ../docs/html/nth -INPUT = nth.docs sofia-sip . +INPUT = @srcdir@/nth.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += \ diff --git a/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am index 6117959c58..2048d53968 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nth/Makefile.am @@ -57,7 +57,7 @@ test_nth_LDFLAGS = -static # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile nth.docs $(BUILT_SOURCES) \ +EXTRA_DIST = nth.docs $(BUILT_SOURCES) \ agent.pem cafile.pem # ---------------------------------------------------------------------- diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile.in similarity index 93% rename from libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile.in index 3a6c8029ca..a8f70ea129 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/nua/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "nua" OUTPUT_DIRECTORY = ../docs/html/nua -INPUT = nua.docs . sofia-sip +INPUT = @srcdir@/nua.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/docs.doxytags=../docs diff --git a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am index fcab6520f3..aa0352cf80 100644 --- a/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/nua/Makefile.am @@ -92,7 +92,7 @@ test_nua_SOURCES = test_nua.c test_nua.h test_ops.c \ # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile nua.docs $(BUILT_SOURCES) +EXTRA_DIST = nua.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile.in similarity index 71% rename from libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile.in index eac30f8363..169419e269 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/sdp/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "sdp" OUTPUT_DIRECTORY = ../docs/html/sdp -INPUT = sdp.docs . sofia-sip +INPUT = @srcdir@/sdp.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/su.doxytags=../su diff --git a/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am index cf14047741..943202fa56 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/sdp/Makefile.am @@ -43,7 +43,7 @@ torture_sdp_LDFLAGS = -static # ---------------------------------------------------------------------- # 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 \ diff --git a/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile.in similarity index 79% rename from libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile.in index d7b12c3e22..ca6472b732 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/sip/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "sip" OUTPUT_DIRECTORY = ../docs/html/sip -INPUT = sofia-sip sip.docs sip_parser.docs . +INPUT = @srcdir@/sofia-sip sofia-sip @srcdir@/sip.docs @srcdir@/sip_parser.docs @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += \ @@ -27,4 +28,4 @@ ALIASES += \ PREDEFINED += SU_HAVE_EXPERIMENTAL=1 -IMAGE_PATH += images +IMAGE_PATH += @srcdir@/images diff --git a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am index 8b1702e24c..1fdd608c95 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/sip/Makefile.am @@ -69,7 +69,7 @@ test_date_LDFLAGS = -static # 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 \ diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile.in similarity index 81% rename from libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile.in index 60758216a5..158b7d9683 100644 --- a/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/soa/Doxyfile.in @@ -1,9 +1,11 @@ PROJECT_NAME = "soa" OUTPUT_DIRECTORY = ../docs/html/soa -INPUT = soa.docs sofia-sip/soa.h sofia-sip/soa_add.h soa.c -INPUT += sofia-sip/soa_tag.h soa_tag.c +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 diff --git a/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am index 17925afe9a..2bcdaf0238 100644 --- a/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/soa/Makefile.am @@ -53,7 +53,7 @@ test_soa_LDFLAGS = -static # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile soa.docs $(BUILT_SOURCES) +EXTRA_DIST = soa.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Sofia specific rules diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile.in similarity index 63% rename from libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile.in index 01e4c7717d..e5b55b7f0f 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile.in @@ -1,10 +1,11 @@ PROJECT_NAME = "sresolv" OUTPUT_DIRECTORY = ../docs/html/sresolv -INPUT = sofia-sip sofia-resolv sresolv.docs . +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" diff --git a/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am index b77a8b2493..96b9631389 100644 --- a/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/sresolv/Makefile.am @@ -51,7 +51,7 @@ COVERAGE_INPUT = $(libsresolv_la_SOURCES) $(include_sofia_HEADERS) # ---------------------------------------------------------------------- # Distribution -EXTRA_DIST = Doxyfile sresolv.docs +EXTRA_DIST = sresolv.docs dist_noinst_DATA = run_test_sresolv \ root.zone rndc.conf \ diff --git a/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile.in similarity index 67% rename from libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile.in index eb9023544a..660775d3da 100644 --- a/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/stun/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "stun" OUTPUT_DIRECTORY = ../docs/html/stun -INPUT = stun.docs sofia-sip . +INPUT = @srcdir@/stun.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/su.doxytags=../su diff --git a/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am index df642cb784..cd77ba4df3 100644 --- a/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/stun/Makefile.am @@ -46,7 +46,7 @@ LDADD = libstun.la ../sresolv/libsresolv.la ../su/libsu.la # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile stun.docs cert.pem key.pem +EXTRA_DIST = stun.docs cert.pem key.pem # ---------------------------------------------------------------------- # Sofia specific rules diff --git a/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c b/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c index 2dd79f042b..fada99babc 100644 --- a/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c +++ b/libs/sofia-sip/libsofia-sip-ua/stun/stunc.c @@ -98,7 +98,7 @@ * @endcode * * @section stunc_environment Environment - * STUN_DEBUG + * #STUN_DEBUG * * @section stunc_bugs Reporting Bugs * Report bugs to . diff --git a/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile.in similarity index 76% rename from libs/sofia-sip/libsofia-sip-ua/su/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/su/Doxyfile.in index daa2174e1a..b46e383de9 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/su/Doxyfile.in @@ -1,9 +1,10 @@ PROJECT_NAME = "su" OUTPUT_DIRECTORY = ../docs/html/su -INPUT = su.docs sofia-sip . +INPUT = @srcdir@/su.docs @srcdir@/sofia-sip sofia-sip @srcdir@ . -@INCLUDE = ../docs/Doxyfile.conf +@INCLUDE_PATH = . @srcdir@ +@INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/msg.doxytags=../msg TAGFILES += ../docs/sip.doxytags=../sip diff --git a/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am index 8ae2003331..66521f415f 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/su/Makefile.am @@ -105,7 +105,7 @@ LDADD = libsu.la # ---------------------------------------------------------------------- # 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 diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_log.c b/libs/sofia-sip/libsofia-sip-ua/su/su_log.c index 9f34e87723..b02a5dbbd7 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_log.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_log.c @@ -63,7 +63,7 @@ * messages based on message priority. * * @sa @ref debug_logs, , - * 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() */ diff --git a/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c b/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c index b17625859e..aece3fdf1b 100644 --- a/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c +++ b/libs/sofia-sip/libsofia-sip-ua/su/su_timer.c @@ -157,7 +157,7 @@ struct su_timer_s { 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 */ diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile.in similarity index 81% rename from libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile.in index c5f9138d09..ba9a92b2e2 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/tport/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "tport" OUTPUT_DIRECTORY = ../docs/html/tport -INPUT = tport.docs sofia-sip . +INPUT = @srcdir@/tport.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += \ diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am index 2deb095344..7606751acc 100644 --- a/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/tport/Makefile.am @@ -80,7 +80,7 @@ test_tport_LDFLAGS = -static # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile tport.docs \ +EXTRA_DIST = tport.docs \ certificates.html agent.pem cafile.pem # ---------------------------------------------------------------------- diff --git a/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile b/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile.in similarity index 71% rename from libs/sofia-sip/libsofia-sip-ua/url/Doxyfile rename to libs/sofia-sip/libsofia-sip-ua/url/Doxyfile.in index 135830ea68..3823590bee 100644 --- a/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile +++ b/libs/sofia-sip/libsofia-sip-ua/url/Doxyfile.in @@ -1,8 +1,9 @@ PROJECT_NAME = "url" OUTPUT_DIRECTORY = ../docs/html/url -INPUT = url.docs sofia-sip . +INPUT = @srcdir@/url.docs @srcdir@/sofia-sip @srcdir@ . +@INCLUDE_PATH = . @srcdir@ @INCLUDE = ../docs/Doxyfile.conf TAGFILES += ../docs/su.doxytags=../su diff --git a/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am b/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am index b36f50733b..edaddf102c 100644 --- a/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am +++ b/libs/sofia-sip/libsofia-sip-ua/url/Makefile.am @@ -43,7 +43,7 @@ test_urlmap_CFLAGS = $(CFLAGS) -DTEST_URLMAP=1 # ---------------------------------------------------------------------- # Install and distribution rules -EXTRA_DIST = Doxyfile url.docs $(BUILT_SOURCES) +EXTRA_DIST = url.docs $(BUILT_SOURCES) # ---------------------------------------------------------------------- # Tests diff --git a/libs/sofia-sip/utils/Doxyfile.build.in b/libs/sofia-sip/utils/Doxyfile.build.in deleted file mode 100644 index 0ccbf1e298..0000000000 --- a/libs/sofia-sip/utils/Doxyfile.build.in +++ /dev/null @@ -1,22 +0,0 @@ -# -# Template for Doxyfile.build -# -# Copyright (C) 2006 Nokia Corporation -# Contact: Pekka Pessi -# Licensed under LGPL. See file COPYING. -# - -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 -@INCLUDE = Doxyfile diff --git a/libs/sofia-sip/utils/Doxyfile b/libs/sofia-sip/utils/Doxyfile.in similarity index 59% rename from libs/sofia-sip/utils/Doxyfile rename to libs/sofia-sip/utils/Doxyfile.in index a1d1aa8c7f..5eeb82130c 100644 --- a/libs/sofia-sip/utils/Doxyfile +++ b/libs/sofia-sip/utils/Doxyfile.in @@ -1,12 +1,35 @@ +# +# Template for Doxyfile. +# @configure_input@ +# +# Copyright (C) 2006 Nokia Corporation +# Contact: Pekka Pessi +# 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 = +TAGFILES = OUTPUT_LANGUAGE = English diff --git a/libs/sofia-sip/utils/Makefile.am b/libs/sofia-sip/utils/Makefile.am index bb9b9c46fa..7c96c8f441 100644 --- a/libs/sofia-sip/utils/Makefile.am +++ b/libs/sofia-sip/utils/Makefile.am @@ -44,5 +44,3 @@ noinst_HEADERS = apps_utils.h bin_PROGRAMS = sip-options sip-date sip-dig LDADD = ../libsofia-sip-ua/libsofia-sip-ua.la $(GLIB_LIBS) - -EXTRA_DIST = Doxyfile diff --git a/libs/sofia-sip/utils/sip-dig.c b/libs/sofia-sip/utils/sip-dig.c index a2be4cb344..d318e2d60c 100644 --- a/libs/sofia-sip/utils/sip-dig.c +++ b/libs/sofia-sip/utils/sip-dig.c @@ -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 . diff --git a/libs/sofia-sip/utils/sip-options.c b/libs/sofia-sip/utils/sip-options.c index 6a28c0edac..219ea4e83e 100644 --- a/libs/sofia-sip/utils/sip-options.c +++ b/libs/sofia-sip/utils/sip-options.c @@ -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 .