Merge branch 'dbus-1.6'

[platform/upstream/dbus.git] / doc / Makefile.am

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 3fdb780..96f7bc3 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -59,9 +59,6 @@ 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=                                  \
        dbus-faq.html                           \
        dbus-specification.html                 \
@@ -69,6 +66,8 @@ XMLTO_OUTPUT=                                 \
        dbus-tutorial.html
 
 if DBUS_XML_DOCS_ENABLED
+html_DATA += $(XMLTO_OUTPUT)
+
 dbus-specification.html: dbus-specification.xml
        $(XMLTO) html-nochunks $<
 
@@ -106,6 +105,7 @@ uninstall-local::
        rm -f $(DESTDIR)$(apidir)/*.html
        rm -f $(DESTDIR)$(apidir)/*.png
        rm -f $(DESTDIR)$(apidir)/*.css
+       rm -f $(DESTDIR)$(apidir)/*.js
        rm -f $(DESTDIR)$(htmldir)/*.html
        rm -f $(DESTDIR)$(docdir)/*.txt
        rm -f $(DESTDIR)$(htmldir)/*.png
@@ -118,7 +118,7 @@ if DBUS_HAVE_MAN2HTML
 html_DATA += $(MAN_HTML_FILES)
 
 %.1.html: %.1
-       $(AM_V_GEN)( $(MAN2HTML) $< > $@.tmp && mv $@.tmp $@ )
+       $(AM_V_GEN)( $(MAN2HTML) < $< > $@.tmp && mv $@.tmp $@ )
 endif
 
 if DBUS_CAN_UPLOAD_DOCS
@@ -130,7 +130,7 @@ 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) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_OUTPUT)
        $(AM_V_at)rm -rf $@ $@.tmp
        $(AM_V_GEN)$(MKDIR_P) $@.tmp/api
        $(AM_V_at)cd $(srcdir) && cp $(STATIC_DOCS) @abs_builddir@/$@.tmp