diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-25 15:49:19 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-02-25 15:49:19 +0000 |
| commit | f1ba52066cadb90edb192ea93d55ba775bdb73d7 (patch) | |
| tree | 57074935fa7f9c44746d2bd9281d010b323e5c1a /doc/Makefile.am | |
| parent | c728addb610cd230d2aa0c1c857888377063a5df (diff) | |
| parent | 1be098611ebeee171991e50571574a6e13388df4 (diff) | |
| download | dbus-f1ba52066cadb90edb192ea93d55ba775bdb73d7.tar.gz | |
Merge branch 'doxygenate' into dbus-1.4
Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Conflicts:
configure.ac
doc/Makefile.am
Diffstat (limited to 'doc/Makefile.am')
| -rw-r--r-- | doc/Makefile.am | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 7fe0dc10..adac743c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,5 @@ +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 @@ -40,6 +42,7 @@ STATIC_DOCS = \ EXTRA_DIST = \ file-boilerplate.c \ + doxygen_to_devhelp.xsl \ $(STATIC_DOCS) \ $(MAN_IN_FILES) @@ -69,13 +72,24 @@ dbus-faq.html: dbus-faq.xml endif if DBUS_DOXYGEN_DOCS_ENABLED -# Use the index as a proxy for the entire doc tree. -DOXYGEN_HTML_INDEX = api/html/index.html - -all-local:: $(DOXYGEN_HTML_INDEX) +all-local:: doxygen.stamp -$(DOXYGEN_HTML_INDEX): $(wildcard $(top_srcdir)/dbus/*.[ch]) +doxygen.stamp: $(wildcard $(top_srcdir)/dbus/*.[ch]) $(AM_V_GEN)cd $(top_builddir) && doxygen Doxyfile + @touch $@ + +if DBUS_HAVE_XSLTPROC +api_DATA = dbus.devhelp + +dbus.devhelp: $(srcdir)/doxygen_to_devhelp.xsl doxygen.stamp + $(XSLTPROC) -o $@ $< api/xml/index.xml +endif + +# this assumes CREATE_SUBDIRS isn't set to YES in Doxyfile +# (which it isn't currently) +install-data-local:: doxygen.stamp + $(MKDIR_P) $(DESTDIR)$(apidir) + $(INSTALL_DATA) api/html/* $(DESTDIR)$(apidir) endif if DBUS_HAVE_MAN2HTML @@ -94,9 +108,9 @@ BONUS_FILES = \ $(top_srcdir)/COPYING \ $(top_srcdir)/ChangeLog -dbus-docs: $(STATIC_DOCS) $(HTML_FILES) $(MAN_HTML_FILES) $(BONUS_FILES) $(DOXYGEN_HTML_INDEX) +dbus-docs: $(STATIC_DOCS) $(HTML_FILES) $(MAN_HTML_FILES) $(BONUS_FILES) doxygen.stamp $(AM_V_at)rm -rf $@ - $(AM_V_GEN)mkdir -p $@/api + $(AM_V_GEN)$(MKDIR_P) $@/api $(AM_V_at)cp $(STATIC_DOCS) $@ $(AM_V_at)cp $(HTML_FILES) $@ $(AM_V_at)cp $(MAN_HTML_FILES) $@ |