bus: Assign a serial number for messages from the driver

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

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 8bc85c5..0d76755 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,7 +20,8 @@ endif
 
 MAN_HTML_FILES = $(patsubst %.1,%.1.html,$(man_pages))
 
-DTDS = \
+dtddir = $(datadir)/xml/dbus-1
+dist_dtd_DATA = \
        busconfig.dtd \
        introspect.dtd
 
@@ -34,8 +35,7 @@ STATIC_DOCS = \
        dbus-tutorial.xml \
        dbus-api-design.duck \
        dcop-howto.txt \
-       introspect.xsl \
-       $(DTDS)
+       introspect.xsl
 
 EXTRA_DIST = \
        file-boilerplate.c \
@@ -57,6 +57,7 @@ STATIC_HTML = \
 YELP_STATIC_HTML = \
        yelp.js \
        C.css \
+       highlight.pack.js \
        jquery.js \
        jquery.syntax.js \
        jquery.syntax.brush.html.js \
@@ -97,14 +98,14 @@ doxygen.stamp: $(wildcard $(top_srcdir)/dbus/*.[ch])
        @touch $@
 
 if DBUS_HAVE_XSLTPROC
-html_DATA += dbus.devhelp
+html_DATA += dbus.devhelp2
 
-dbus.devhelp: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp
+dbus.devhelp2: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp
        $(XSLTPROC) -o $@ $< api/xml/index.xml
 endif
 
 if DBUS_DUCKTYPE_DOCS_ENABLED
-html_DATA += $(YELP_HTML) $(YELP_STATIC_HTML)
+html_DATA += $(YELP_HTML)
 
 %.page: %.duck
        $(DUCKTYPE) -o $@ $<
@@ -118,12 +119,21 @@ endif
 install-data-local:: doxygen.stamp
        $(MKDIR_P) $(DESTDIR)$(apidir)
        $(INSTALL_DATA) api/html/* $(DESTDIR)$(apidir)
+if DBUS_DUCKTYPE_DOCS_ENABLED
+       $(AM_V_at)for x in $(YELP_STATIC_HTML); do \
+               if test -e "$$x"; then \
+                       $(INSTALL_DATA) "$$x" $(DESTDIR)$(htmldir); \
+               fi; \
+       done
+endif
 
 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)/*.css
+       rm -f $(DESTDIR)$(htmldir)/*.js
        rm -f $(DESTDIR)$(htmldir)/*.html
        rm -f $(DESTDIR)$(docdir)/*.txt
        rm -f $(DESTDIR)$(htmldir)/*.png
@@ -135,21 +145,25 @@ endif
 if DBUS_CAN_UPLOAD_DOCS
 BONUS_FILES = \
        $(top_srcdir)/README \
-       $(top_srcdir)/HACKING \
+       $(top_srcdir)/CONTRIBUTING.md \
        $(top_srcdir)/AUTHORS \
        $(top_srcdir)/NEWS \
-       $(top_srcdir)/COPYING \
        $(top_srcdir)/ChangeLog
 
-dbus-docs: $(STATIC_DOCS) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML) $(YELP_HTML) $(YELP_STATIC_HTML)
+dbus-docs: $(STATIC_DOCS) $(dist_dtd_DATA) $(MAN_XML_FILES) $(dist_doc_DATA) $(dist_html_DATA) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(XMLTO_HTML) $(YELP_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_dtd_DATA) @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_HTML) @abs_builddir@/$@.tmp
        $(AM_V_at)cp $(YELP_HTML) @abs_builddir@/$@.tmp
-       $(AM_V_at)cp $(YELP_STATIC_HTML) @abs_builddir@/$@.tmp
+       $(AM_V_at)for x in $(YELP_STATIC_HTML); do \
+               if test -e "$$x"; then \
+                       cp "$$x" @abs_builddir@/$@.tmp; \
+               fi; \
+       done
        $(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
@@ -169,12 +183,11 @@ maintainer-upload-docs: dbus-docs.tar.gz dbus-docs
        scp dbus-docs.tar.gz $(DOC_SERVER):$(DOC_WWW_DIR)/
        rsync -rpvzP --chmod=Dg+s,ug+rwX,o=rX \
                dbus-docs/ $(DOC_SERVER):$(DOC_WWW_DIR)/doc/
-       cd $(srcdir) && scp -p $(DTDS) $(SPECIFICATION_SERVER):$(SPECIFICATION_PATH)/
+       cd $(srcdir) && scp -p $(dist_dtd_DATA) $(SPECIFICATION_SERVER):$(SPECIFICATION_PATH)/
 else
 maintainer-upload-docs:
        @echo "Can't upload documentation! Re-run configure with"
        @echo "  --enable-doxygen-docs --enable-xml-docs --enable-ducktype-docs"
-       @echo "and ensure that man2html is installed."
        @false
 endif