switch doxygen generation in sofia-sip around to use configure generated files. ...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4979 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/sofia-sip/configure.ac b/libs/sofia-sip/configure.ac
index 55161c40e5d6ca15fcbd72146fb316442f93240b..a30b37ec0146de96c3795a67a0d724286361665d 100644 (file)
--- 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 25491ef5001cc3ccbcb0e084a4384bb677471594..f2612b6e2d5a60954172fd73857a71fa07afe7e5 100644 (file)
--- 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 3500ac55715fbb5ede6c99aba09de96426f51ce1..b0afbb73f2acbe9bad822a99962953489c8d3a98 100644 (file)
--- 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 4c46c8833c09a1107f936855c66e7df54523bf7d..f50d1d95137f2448f333e5da0a16c7de22a73bd0 100644 (file)
--- 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!<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 @@ 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 4d09dd96719b56a11faa123e72c6273e0d0ef2b0..bca76a1aaab85da6bbfcf753772704868e08db91 100644 (file)
--- 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 5fc5406f879ed69b57c5b21b404c3eefaa4a559d..569e517a26a7d3921905b037976b1a16e9c51484 100644 (file)
--- 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 fd417ee7324d2443f923322da1d6193fb5c3f53d..d3097c7332e7a9aacf2d7c3027a4c8a3132a91d5 100644 (file)
--- 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 5b1e67c614647f29256a37eb95a530d7283456dc..77a21b48866b2e183cb3e37c10ef0f579b0b2a94 100644 (file)
--- 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 174d1d894bd90c4b3f8a3a94793a16ebad151adc..2fc743cfdf50b279de7941a7482def8412dca50a 100644 (file)
--- 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 112632432d46cedce52ea9d8bfbcf211e0e80cdc..7549937885d1429b2d3e6bb90d1b1bcb5682c65d 100644 (file)
--- 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 35e52d854d694bffa6f540e9b3000f53b60a0aa1..c82261934cdef56ef25763ef8f3c69221868f511 100644 (file)
--- 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 2ffd7e46b75fa361bf4cc84f36fafc3729986b24..ad72360a2076f2152d08e2d2136046c9f3d08138 100644 (file)
--- 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 8f96fb05c6a7fdd17d1c53d0352ce727a2d07f11..eefbfaaffe6a8b15d53598173b016671445defda 100644 (file)
--- 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 765ea5117fcf2f87a8941ab0cf32b89a5be58a94..eb4fca4ee30fc761aaba37060d8b33db5b4eec47 100644 (file)
--- 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 a9bc00d69174c2f3f37bb989da9c19247492b40f..808b6f639ad677820f6a928f0c11cf9fb50903bf 100644 (file)
--- 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 736755d7b94b0c1f751acc6347904610a2ec0e88..7b06ed5984e77e914fbc2735d074be071ac03874 100644 (file)
--- 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 90c7cc242b77144d6d3ef976ba63d68c76d991c0..1f8b2e927c667a6791d3685d3b714f202a63a62d 100644 (file)
--- 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 bc16f9cfed977921fb3b389389339d3c2a420096..a22287378d00a4e4cef2ae275ca88aa5f17400ce 100644 (file)
--- 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 aa3424098dea917724cf9c1025a2c0d3d9c9ce1f..ed2129f820f376428b0ceec941d5e649e76e5dcd 100644 (file)
--- 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 a87a2bb9e957d19e62e76a1d519fcefee31fd4c0..29924b7dabd4964d0704b638a1e0fe3214d3fe7f 100644 (file)
--- 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 <Pekka.Pessi@nokia.com>
  * 

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 c20070106617a97daedb6915e4065ba09c2bf916..e51c2f942b8b41ed95a97497a0b3dbc3787af155 100644 (file)
--- 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 14a341bb911fe40c0d457def79483321ae0567df..441e99bd7b0e281439e48157d9b4b556e8cc8d47 100644 (file)
--- 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 a24941f37dd7ae5527feba6aacb4646200a0d116..484147fbc2c40a6d2665c9246a97267984377643 100644 (file)
--- 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 5b27b9252efc461a71dd2cfe866b9d2f07ea206f..43b4cce91896286c2bcabaa7d410b71780e9b37c 100644 (file)
--- 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 84%
rename from libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile
rename to libs/sofia-sip/libsofia-sip-ua/nta/Doxyfile.in
index 866955d9cc61a88d65d6fb7f7c0d8eca3c1fd470..58f9789d7eaddda98395766ea9131bd9cea5037a 100644 (file)
--- 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 ac86e31c6bd742dfab409f0ad04aad725e0ad43f..364823c6ab1579f49842cbbc52ef43e65d02e016 100644 (file)
--- 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 ef81f26bbf86ab02dd272204c765eadabadf31a9..7b287c0cada9ed8189e29399e4bf63b431787654 100644 (file)
--- 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 6117959c58aaebdfe0a0f5c7ea6d6c7574fff9f5..2048d53968d3bb03d648c4346377247ac00522b9 100644 (file)
--- 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 3a6c8029cad368991556a7390aaeae9397d86c0e..a8f70ea1296a408ffcaedea89a4f546abbdaf96b 100644 (file)
--- 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 fcab6520f33c029cfda38d96c553369476c8d5b8..aa0352cf805b4e409f8d3c79b434279f4eb58878 100644 (file)
--- 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 eac30f8363c0e1804e4492253685953ce8bab30c..169419e269f734437434f4b1148dd611c7e26dc9 100644 (file)
--- 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 cf140477414246bffe712a3ee0beb31c441cc859..943202fa5674bc75af7daf569c7d57a4e2925ed0 100644 (file)
--- 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 d7b12c3e22f78f493c08c909fe1e4680edcf1539..ca6472b73276b4bf4eb991685751648047876c2c 100644 (file)
--- 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 8b1702e24c9767013d9beac7daa640679eab27f1..1fdd608c9584c990bb9fda9ba9f4c21327ca2464 100644 (file)
--- 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 60758216a56e8d8aab1eaa41d7bfcb461d65d14e..158b7d9683326e6c3166f4f65200d60be2898750 100644 (file)
--- 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 17925afe9af86a09ac43163aee301e293ce888b0..2bcdaf0238aa577fba89e1c3faea5cc42b073407 100644 (file)
--- 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 75%
rename from libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile
rename to libs/sofia-sip/libsofia-sip-ua/sresolv/Doxyfile.in
index 01e4c7717d4401c354ba7d6181f1673dc641b344..e5b55b7f0f1fd514b22ab9f8e52d58456c3ee472 100644 (file)
--- 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 b77a8b2493499953ca24d04412cd368dac694092..96b9631389173b30063471d140402faea2e33cc9 100644 (file)
--- 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 eb9023544af432b8d0b1c9f0c0a6f227d3083913..660775d3daae4957a47a245f23954974d7a88485 100644 (file)
--- 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 df642cb784fce7bbbb1e65e6fcf136caf6ee36ae..cd77ba4df3f7f48b762d15755339830ea96ce6a0 100644 (file)
--- 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 2dd79f042b2c0f348ec46d5462d4140c6a8e7007..fada99babc17b127edaafe78a9b928eef59f184c 100644 (file)
--- 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 <sofia-sip-devel@lists.sourceforge.net>.

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 daa2174e1afdae4526651fb27bb7256c499be719..b46e383de959d762dab807faa28ecf5c6db53f6c 100644 (file)
--- 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 8ae20033318b7207712ecdc33288d434af4a4f99..66521f415f190a091b9452cb15bef03bf177cb54 100644 (file)
--- 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 9f34e87723cc8fea984de244590c1806eb9dd239..b02a5dbbd7545f05373a17a658e789e75fac4077 100644 (file)
--- 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, <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()
  */

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 b17625859e29247096ffe572a98b37ce8dadf04c..aece3fdf1b324edf1fe6f961cbcc90d97cf28e9e 100644 (file)
--- 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 c5f9138d09b93451f15aa2b4ebc54ad9830a9746..ba9a92b2e2e98688c566feecc4642daa458bb6d4 100644 (file)
--- 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 2deb095344dd9446a64e2fc24a88294932c1cc72..7606751acc710b00e4af7c85fbf369565cee363d 100644 (file)
--- 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 135830ea68d75e20939727aceb3e8737ae3f0832..3823590bee5bf752b2b48247d3d7507e67a5cce7 100644 (file)
--- 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 b36f50733b67f5b64e9015a9e9bd49ed19d18c21..edaddf102c5fc94d773a60c37bdd5f80c931af9e 100644 (file)
--- 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 (file)
index 0ccbf1e..0000000
--- 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 <pekka.pessi@nokia.com>
-# 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 a1d1aa8c7f837fa6568c9aa6f707d31b1d9c1261..5eeb82130c3bbc9a13637752dadc90c63030c09f 100644 (file)
--- 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 <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            = 
+TAGFILES             = 
 
 OUTPUT_LANGUAGE      = English
 

diff --git a/libs/sofia-sip/utils/Makefile.am b/libs/sofia-sip/utils/Makefile.am
index bb9b9c46fae96e3eead339cafc0a02067130e237..7c96c8f441c1018bfc1f3cda30bdd6edb199f6b6 100644 (file)
--- 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 a2be4cb344a2f036b2760d8ad8cb9e5c157f8dfe..d318e2d60cebb7c53e6132d2de7e58f37a382e35 100644 (file)
--- 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 <sofia-sip-devel@lists.sourceforge.net>.

diff --git a/libs/sofia-sip/utils/sip-options.c b/libs/sofia-sip/utils/sip-options.c
index 6a28c0edace77c17d5d53317600c3e301b594b56..219ea4e83e135bd45445986e64dd3ce2fda67e91 100644 (file)
--- 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 <sofia-sip-devel@lists.sourceforge.net>.