[mm-common] Revert "doc-reference.am: Don't assume all existing html files shall be rebuilt"



commit 94b940436eb946e4bc80e1e62c60bc0e3c9324e7
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Thu Aug 13 09:20:35 2015 +0200

    Revert "doc-reference.am: Don't assume all existing html files shall be rebuilt"
    
    This reverts commit 1ed83c95f60bf6e10a148e43fd4e4201761d2459.
    
    That commit does not work well together with jhbuild. Bug #686364.

 build/doc-reference.am |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)
---
diff --git a/build/doc-reference.am b/build/doc-reference.am
index 1578b2f..975d23f 100644
--- a/build/doc-reference.am
+++ b/build/doc-reference.am
@@ -68,12 +68,10 @@ htmlrefdir   = $(referencedir)/html
 devhelpdir   = $(datadir)/devhelp/books/$(book_name)
 
 if ENABLE_DOCUMENTATION
-doc_build_files  = $(doc_outdir)/html/index.html $(doxytagfile) $(devhelpfile)
 doc_inst_targets = install-htmlref install-devhelp
 doc_inst_files   = $(doxytagfile)
 doc_dist_files   = $(devhelpfile) $(call vpath_listall,$(htmlref_patterns))
 else
-doc_build_files  =
 doc_inst_targets =
 doc_inst_files   =
 doc_dist_files   =
@@ -135,11 +133,8 @@ else
 doc_dependencies =
 endif
 
-# Depend on the files that we know shall be built.
-# $(call vpath_listall,$(htmlref_patterns)) is not used as a prerequisite.
-# It would expand to files that exist when the make command is issued,
-# which is not necessarily the set of files that shall be built.
-all-local: $(doc_build_files)
+# Explicitly depend on the files to be distributed or installed.
+all-local: $(doc_inst_files) $(doc_dist_files)
 
 # Hook up custom rules for translating references to external documentation
 # to the actual location at install time.
@@ -195,7 +190,7 @@ $(doc_outdir)/html/%: | $(doxytagfile)
 # Quote $(DOXYGEN) so that this still works if this is a path containing
 # spaces such as "/c/Program Files (x86)/Doxygen/bin/doxygen"
 # The doc_config file may contain "$(MMDOCTOOLDIR)". Export MMDOCTOOLDIR to Doxygen.
-$(doc_outdir)/html/index.html $(doxytagfile): $(doc_dependencies) | $(doc_config)
+$(doxytagfile): $(doc_dependencies) | $(doc_config)
        -$(AM_V_at)rm -f $@
        -$(AM_V_at)rm -fr $(doc_outdir)/html
        $(AM_V_GEN)(echo '@INCLUDE =' $(doc_config) && echo 'INPUT =' $(doc_input)) | 
MMDOCTOOLDIR="$(MMDOCTOOLDIR)" "$(DOXYGEN)" -


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]