Imported Upstream version 1.4.14upstream/1.4.14

1 files changed, 21 insertions, 13 deletions

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 11f756de..e4ab5fb8 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -28,16 +28,18 @@ DTDS = \
 	busconfig.dtd \
 	introspect.dtd
 
-STATIC_DOCS = \
+dist_doc_DATA = \
 	diagram.png \
 	diagram.svg \
+	system-activation.txt
+
+STATIC_DOCS = \
 	dbus-faq.xml \
 	dbus-specification.xml \
 	dbus-test-plan.xml \
 	dbus-tutorial.xml \
 	dcop-howto.txt \
 	introspect.xsl \
-	system-activation.txt \
 	$(DTDS)
 
 EXTRA_DIST = \
@@ -46,17 +48,18 @@ EXTRA_DIST = \
 	$(STATIC_DOCS) \
 	$(MAN_IN_FILES)
 
-HTML_FILES=					\
+html_DATA =
+
+# we distribute these in the tarball so users don't necessarily need xmlto
+dist_html_DATA = $(XMLTO_OUTPUT)
+
+XMLTO_OUTPUT=					\
 	dbus-faq.html				\
 	dbus-specification.html			\
 	dbus-test-plan.html			\
 	dbus-tutorial.html
 
 if DBUS_XML_DOCS_ENABLED
-all-local:: $(HTML_FILES)
-
-EXTRA_DIST += $(HTML_FILES)
-
 dbus-specification.html: dbus-specification.xml
 	$(XMLTO) html-nochunks $<
 
@@ -68,7 +71,6 @@ dbus-tutorial.html: dbus-tutorial.xml
 
 dbus-faq.html: dbus-faq.xml
 	$(XMLTO) html-nochunks $<
-
 endif
 
 if DBUS_DOXYGEN_DOCS_ENABLED
@@ -79,7 +81,7 @@ doxygen.stamp: $(wildcard $(top_srcdir)/dbus/*.[ch])
 	@touch $@
 
 if DBUS_HAVE_XSLTPROC
-api_DATA = dbus.devhelp
+html_DATA += dbus.devhelp
 
 dbus.devhelp: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp
 	$(XSLTPROC) -o $@ $< api/xml/index.xml
@@ -95,12 +97,16 @@ uninstall-local::
 	rm -f $(DESTDIR)$(apidir)/*.html
 	rm -f $(DESTDIR)$(apidir)/*.png
 	rm -f $(DESTDIR)$(apidir)/*.css
+	rm -f $(DESTDIR)$(htmldir)/*.html
+	rm -f $(DESTDIR)$(docdir)/*.txt
+	rm -f $(DESTDIR)$(docdir)/*.png
+	rm -f $(DESTDIR)$(docdir)/*.svg
 	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(apidir) || \
 		rmdir $(DESTDIR)$(apidir)
 endif
 
 if DBUS_HAVE_MAN2HTML
-all-local:: $(MAN_HTML_FILES)
+html_DATA += $(MAN_HTML_FILES)
 
 %.1.html: %.1
 	$(AM_V_GEN)( $(MAN2HTML) $< > $@.tmp && mv $@.tmp $@ )
@@ -115,11 +121,12 @@ BONUS_FILES = \
 	$(top_srcdir)/COPYING \
 	$(top_srcdir)/ChangeLog
 
-dbus-docs: $(STATIC_DOCS) $(HTML_FILES) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp
+dbus-docs: $(STATIC_DOCS) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp
 	$(AM_V_at)rm -rf $@
 	$(AM_V_GEN)$(MKDIR_P) $@/api
 	$(AM_V_at)cp $(STATIC_DOCS) $@
-	$(AM_V_at)cp $(HTML_FILES) $@
+	$(AM_V_at)cp $(dist_doc_DATA) $@
+	$(AM_V_at)cp $(dist_html_DATA) $@
 	$(AM_V_at)cp $(MAN_HTML_FILES) $@
 	$(AM_V_at)cp $(BONUS_FILES) $@
 	$(AM_V_at)cp -r api/html $@/api
@@ -147,10 +154,11 @@ maintainer-upload-docs:
 endif
 
 clean-local:
+	rm -f $(html_DATA)
 	rm -rf api
 	rm -rf dbus-docs
 	rm -f *.1.html
 	rm -f doxygen.stamp
 
 maintainer-clean-local:
-	rm -f $(HTML_FILES)
+	rm -f $(XMLTO_OUTPUT)