From b72f6e0ca00da1dd4134e6e113ea1e656df770ed Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Thu, 13 Jan 2011 18:33:54 +0000 Subject: [PATCH 5/8] 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. --- doc/Makefile.am | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index 5f81a65..834da05 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) $@ -- 1.7.2.3