Fixed manpages build.

darcs-hash:20060930130052-65a35-0bc3fc0a338bf89a725511375225ea9e279085cf.gz

Makefile.am

@@ -29,21 +29,16 @@ dist_man_MANS = man/man1/sip-date.1 man/man1/sip-options.1 \
 		man/man1/localinfo.1 man/man1/addrinfo.1 \
 		man/man1/stunc.1 man/man1/sip-dig.1
 
-manpages $(MANS):
+manpages $(dist_man_MANS): built-sources
 	-mkdir -p $(srcdir)/man $(srcdir)/man/man1 2> /dev/null
+if HAVE_DOXYGEN
 	cd $(srcdir)/utils; $(DOXYGEN)
-if !HAVE_DOXYGEN
+else
 	-touch $(MANS)
 endif
 
-coverage built-sources clean-built-sources:
+coverage built-sources clean-built-sources doxygen:
 	@$(MAKE) $(AM_MAKEFLAGS) -C libsofia-sip-ua $@
 	@$(MAKE) $(AM_MAKEFLAGS) -C libsofia-sip-ua-glib $@
 
-doxygen:
-if HAVE_DOXYGEN
-	@$(MAKE) $(AM_MAKEFLAGS) -C libsofia-sip-ua $@
-endif
-
-.PHONY: coverage built-sources clean-built-sources doxygen
-.PHONY: manpages doxygen-manpages
+.PHONY: coverage built-sources clean-built-sources doxygen manpages

libsofia-sip-ua/Makefile.am

@@ -77,7 +77,7 @@ doxygen: built-sources
 	for d in $(DIST_SUBDIRS); do \
 	  test -r $$d/Doxyfile \
 	  && pushd $$d > /dev/null \
-	  && echo running ${DOXYGEN} in $$d \
+	  && echo running ${DOXYGEN} first time in $$d \
           && ${DOXYGEN} | fgrep -v -e resolve \
 	  | fgrep -v -e 'Warning: Unsupported xml/html tag' \
           ; popd > /dev/null ; \
@@ -90,7 +90,7 @@ doxygen: built-sources
 	for d in $(DIST_SUBDIRS); do \
 	  test -r $$d/Doxyfile \
 	  && pushd $$d > /dev/null \
-	  && echo running ${DOXYGEN} in $$d \
+	  && echo running ${DOXYGEN} in second time in $$d \
           && ${DOXYGEN} | fgrep -v -e 'Warning: Unsupported xml/html tag' \
           ; popd > /dev/null ; \
 	  test -r docs/$$d.doxytags && \

libsofia-sip-ua/docs/Makefile.am

@@ -32,16 +32,15 @@ BUILT_SOURCES = Doxyfile.rfc
 EXTRA_DIST += $(BUILT_SOURCES)
 
 Doxyfile.rfc:
-	from=700 to=4800 site=http://www.faqs.org/rfcs/rfc ;\
-	{ \
-	echo '# Autogenerated aliases for all RFCs '$$from' .. '$$to ;\
-	echo 'ALIASES += \' ;\
-	i=$$from ;\
-	while test $$i -le $$to ; do \
-	  echo '  "RFC'$$i'=<a href=\"'$$site$$i'.html\">RFC '$$i'</a>" \';\
-	  i=`expr $$i + 1` ;\
-	done ;\
-	} > $@
+	$(AWK) 'END { b="\\"; q="\\\""; \
+		print "# Autogenerated aliases for RFCs "from" .. "to ; \
+		print "ALIASES += " b; \
+		for (i=from; i < to; i++) { \
+		  print "RFC"i"=\"<a href="q site i type q">RFC "i"</a>\" "b; \
+		}}' \
+	site=http://www.faqs.org/rfcs/rfc type=.html \
+	from=700 to=4800 \
+	/dev/null > $@
 
 # ----------------------------------------------------------------------
 # Sofia specific rules

utils/Doxyfile

-PROJECT_NAME         = "libsofia-sip-ua"
+PROJECT_NAME         = "sofia-sip"
 OUTPUT_DIRECTORY     = ../man
 
 INPUT 		     = . 
@@ -7,6 +7,7 @@ INPUT               += ../libsofia-sip-ua/su/addrinfo.c
 INPUT               += ../libsofia-sip-ua/stun/stunc.c
 
 @INCLUDE = ../libsofia-sip-ua/docs/Doxyfile.aliases
+@INCLUDE = ../libsofia-sip-ua/docs/Doxyfile.version
 @INCLUDE = ../libsofia-sip-ua/docs/Doxyfile.rfc
 
 FILE_PATTERNS        = *.h *.c 
@@ -16,22 +17,6 @@ EXCLUDE_PATTERNS     = acconfig.h config.h confdefs.h \
 			*_tag_dll.c *_tag_ref.c
 
 TAGFILES            = 
-TAGFILES            += ../libsofia-sip-ua/docs/su.doxytags=su
-TAGFILES            += ../libsofia-sip-ua/docs/ipt.doxytags=ipt
-TAGFILES            += ../libsofia-sip-ua/docs/bnf.doxytags=bnf
-TAGFILES            += ../libsofia-sip-ua/docs/url.doxytags=url
-TAGFILES            += ../libsofia-sip-ua/docs/msg.doxytags=msg
-TAGFILES            += ../libsofia-sip-ua/docs/sip.doxytags=sip
-TAGFILES            += ../libsofia-sip-ua/docs/sresolv.doxytags=sresolv
-TAGFILES            += ../libsofia-sip-ua/docs/stun.doxytags=stun
-TAGFILES            += ../libsofia-sip-ua/docs/tport.doxytags=tport
-TAGFILES            += ../libsofia-sip-ua/docs/nta.doxytags=nta
-TAGFILES            += ../libsofia-sip-ua/docs/iptsec.doxytags=iptsec
-TAGFILES            += ../libsofia-sip-ua/docs/sdp.doxytags=sdp
-TAGFILES            += ../libsofia-sip-ua/docs/soa.doxytags=soa
-TAGFILES            += ../libsofia-sip-ua/docs/nea.doxytags=nea
-TAGFILES            += ../libsofia-sip-ua/docs/nua.doxytags=nua
-TAGFILES            += ../libsofia-sip-ua/docs/features.doxytags=features
 
 OUTPUT_LANGUAGE      = English