summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2011-01-13 18:33:54 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2011-01-14 12:45:52 +0000
commitb72f6e0ca00da1dd4134e6e113ea1e656df770ed (patch)
treeb47143cb676bf99c7a9132e4de4d0ae3e32d64f5
parent5bf055422b4e7c0200157d20f0881d74877c65ef (diff)
Use a stamp file to represent the Doxygen output
This avoids thinking it's up to date if the Doxygen build fails, but writes partial output to index.html before failing.
-rw-r--r--doc/Makefile.am10
1 files changed, 4 insertions, 6 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5f81a657..834da057 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -64,13 +64,11 @@ 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.stamp
-all-local:: $(DOXYGEN_HTML_INDEX)
-
-$(DOXYGEN_HTML_INDEX): $(wildcard $(top_srcdir)/dbus/*.[ch])
+doxygen.stamp: $(wildcard $(top_srcdir)/dbus/*.[ch])
$(AM_V_GEN)cd $(top_builddir) && doxygen Doxyfile
+ @touch $@
endif
if DBUS_HAVE_MAN2HTML
@@ -89,7 +87,7 @@ 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_at)cp $(STATIC_DOCS) $@