Merge branch 'master' of git://anonscm.debian.org/pkg-utopia/dbus

Conflicts:
	debian/changelog
	debian/dbus.postinst

1 files changed, 28 insertions, 43 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index b2659871..b9a4c106 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,28 +1,22 @@
 apidir = @htmldir@/api
 
-# automake normally assumes that man pages are generated files;
-# these ones aren't, so we need the dist_ prefix to say that they're
-# their own source code
-dist_man1_MANS = \
+man_pages = \
 	dbus-cleanup-sockets.1 \
+	dbus-daemon.1 \
 	dbus-launch.1 \
 	dbus-monitor.1 \
+	dbus-run-session.1 \
 	dbus-send.1 \
-	dbus-uuidgen.1
+	dbus-uuidgen.1 \
+	$(NULL)
 
-# on the other hand, this one is generated
-man1_MANS = \
-	dbus-daemon.1
+MAN_XML_FILES = $(patsubst %.1,%.1.xml,$(man_pages))
 
-MAN_IN_FILES = dbus-daemon.1.in
+if DBUS_XML_DOCS_ENABLED
+man1_MANS = $(man_pages)
+endif
 
-MAN_HTML_FILES = \
-	dbus-cleanup-sockets.1.html \
-	dbus-daemon.1.html \
-	dbus-launch.1.html \
-	dbus-monitor.1.html \
-	dbus-send.1.html \
-	dbus-uuidgen.1.html
+MAN_HTML_FILES = $(patsubst %.1,%.1.html,$(man_pages))
 
 DTDS = \
 	busconfig.dtd \
@@ -43,8 +37,7 @@ STATIC_DOCS = \
 EXTRA_DIST = \
 	file-boilerplate.c \
 	doxygen_to_devhelp.xsl \
-	$(STATIC_DOCS) \
-	$(MAN_IN_FILES)
+	$(STATIC_DOCS)
 
 html_DATA =
 
@@ -59,27 +52,22 @@ STATIC_HTML = \
 
 dist_html_DATA += $(STATIC_HTML)
 
-# we distribute these in the tarball so users don't necessarily need xmlto
-dist_html_DATA += $(XMLTO_OUTPUT)
-
-XMLTO_OUTPUT=					\
+XMLTO_HTML =					\
 	dbus-faq.html				\
 	dbus-specification.html			\
 	dbus-test-plan.html			\
-	dbus-tutorial.html
+	dbus-tutorial.html			\
+	$(MAN_HTML_FILES)			\
+	$(NULL)
 
 if DBUS_XML_DOCS_ENABLED
-dbus-specification.html: dbus-specification.xml
-	$(XMLTO) html-nochunks $<
-
-dbus-test-plan.html: dbus-test-plan.xml
-	$(XMLTO) html-nochunks $<
+html_DATA += $(XMLTO_HTML)
 
-dbus-tutorial.html: dbus-tutorial.xml
+%.html: %.xml
 	$(XMLTO) html-nochunks $<
 
-dbus-faq.html: dbus-faq.xml
-	$(XMLTO) html-nochunks $<
+%.1: %.1.xml
+	$(XMLTO) man $<
 endif
 
 if DBUS_DOXYGEN_DOCS_ENABLED
@@ -115,13 +103,6 @@ uninstall-local::
 		rmdir $(DESTDIR)$(apidir)
 endif
 
-if DBUS_HAVE_MAN2HTML
-html_DATA += $(MAN_HTML_FILES)
-
-%.1.html: %.1
-	$(AM_V_GEN)( $(MAN2HTML) < $< > $@.tmp && mv $@.tmp $@ )
-endif
-
 if DBUS_CAN_UPLOAD_DOCS
 BONUS_FILES = \
 	$(top_srcdir)/README \
@@ -131,14 +112,15 @@ BONUS_FILES = \
 	$(top_srcdir)/COPYING \
 	$(top_srcdir)/ChangeLog
 
-dbus-docs: $(STATIC_DOCS) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp
+dbus-docs: $(STATIC_DOCS) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML)
 	$(AM_V_at)rm -rf $@ $@.tmp
 	$(AM_V_GEN)$(MKDIR_P) $@.tmp/api
 	$(AM_V_at)cd $(srcdir) && cp $(STATIC_DOCS) @abs_builddir@/$@.tmp
 	$(AM_V_at)cd $(srcdir) && cp $(dist_doc_DATA) @abs_builddir@/$@.tmp
 	$(AM_V_at)cd $(srcdir) && cp $(STATIC_HTML) @abs_builddir@/$@.tmp
-	$(AM_V_at)cp $(XMLTO_OUTPUT) @abs_builddir@/$@.tmp
+	$(AM_V_at)cp $(XMLTO_HTML) @abs_builddir@/$@.tmp
 	$(AM_V_at)cp $(MAN_HTML_FILES) @abs_builddir@/$@.tmp
+	$(AM_V_at)cp $(MAN_XML_FILES) @abs_builddir@/$@.tmp
 	$(AM_V_at)cp $(BONUS_FILES) @abs_builddir@/$@.tmp
 	$(AM_V_at)cp -r api/html @abs_builddir@/$@.tmp/api
 	$(AM_V_at)mv $@.tmp $@
@@ -165,12 +147,15 @@ maintainer-upload-docs:
 	@false
 endif
 
+CLEANFILES = \
+	$(man1_MANS) \
+	$(MAN_XML_FILES) \
+	$(XMLTO_HTML) \
+	$(NULL)
+
 clean-local:
 	rm -f $(html_DATA)
 	rm -rf api
 	rm -rf dbus-docs dbus-docs.tmp
 	rm -f *.1.html
 	rm -f doxygen.stamp
-
-maintainer-clean-local:
-	rm -f $(XMLTO_OUTPUT)