Updated make manpages with utils/Doxyfile.build.in.

darcs-hash:20061002130740-65a35-75c11e78b1f1c6b8355cb09b24162e4ba19f5d20.gz

Makefile.am

@@ -30,13 +30,16 @@ dist_man_MANS = man/man1/sip-date.1 man/man1/sip-options.1 \
 		man/man1/stunc.1 man/man1/sip-dig.1
 
 manpages $(dist_man_MANS): built-sources
-	-mkdir -p $(srcdir)/man $(srcdir)/man/man1 2> /dev/null
+	-mkdir -p man man/man1 2> /dev/null
 if HAVE_DOXYGEN
-	cd $(srcdir)/utils; $(DOXYGEN)
+	cd utils && $(DOXYGEN) Doxyfile.build
+	-@rm man/man1/_*.1
 else
 	-touch $(MANS)
 endif
 
+CLEANFILES = $(dist_man_MANS)
+
 coverage built-sources clean-built-sources doxygen:
 	@$(MAKE) $(AM_MAKEFLAGS) -C libsofia-sip-ua $@
 	@$(MAKE) $(AM_MAKEFLAGS) -C libsofia-sip-ua-glib $@

configure.ac

@@ -193,6 +193,7 @@ libsofia-sip-ua-glib/Makefile
 libsofia-sip-ua-glib/nua-glib/Makefile
 libsofia-sip-ua-glib/su-glib/Makefile
 utils/Makefile
+utils/Doxyfile.build
 win32/Makefile
 win32/config.h
 ])

libsofia-sip-ua/docs/Makefile.am

@@ -29,7 +29,7 @@ EXTRA_DIST = 	Doxyfile Doxyfile.aliases Doxyfile.conf \
 
 BUILT_SOURCES = Doxyfile.rfc
 
-EXTRA_DIST += $(BUILT_SOURCES)
+# Including Doxyfile.rfc in dist breaks make manpages
 
 Doxyfile.rfc:
 	$(AWK) 'END { b="\\"; q="\\\""; \
@@ -42,6 +42,8 @@ Doxyfile.rfc:
 	from=700 to=4800 \
 	/dev/null > $@
 
+CLEANFILES = Doxyfile.rfc
+
 # ----------------------------------------------------------------------
 # Sofia specific rules
 

utils/Doxyfile

 PROJECT_NAME         = "sofia-sip"
-OUTPUT_DIRECTORY     = ../man
-
-INPUT 		     = . 
-INPUT               += ../libsofia-sip-ua/su/localinfo.c
-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 
 

utils/Doxyfile.build.in

+#
+# 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 = @top_srcdir@/libsofia-sip-ua/docs/Doxyfile.aliases
+@INCLUDE = ../libsofia-sip-ua/docs/Doxyfile.rfc
+
+@INCLUDE = 	     @srcdir@/Doxyfile