[Olena-patches] last-svn-commit-80-gb6d23f2 Fix dependencies in doc/.

* doc/Makefile.am (refman_dependencies): Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). (technical_dependencies): Add $(TECHNICAL_EXAMPLES). (tutorial_dependencies, ref_guide_dependencies): Add $(EXAMPLES) and $(OUTPUTS). --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 26 ++++++++------------------ 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cafa0d4..41a6f7d 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Fix dependencies in doc/. + + * doc/Makefile.am (refman_dependencies): + Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS). + (technical_dependencies): Add $(TECHNICAL_EXAMPLES). + (tutorial_dependencies, ref_guide_dependencies): + Add $(EXAMPLES) and $(OUTPUTS). + +2010-03-18 Roland Levillain <roland(a)lrde.epita.fr> + Distribute non generated figures in the documentation. * doc/Makefile.am (MORE_FIGURES): New variable. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 63f3ea8..9bd9512 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -267,13 +267,7 @@ regen-split-examples-mk: ## Doxygen documentation. ## ## ----------------------- ## -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. refman_dependencies = \ - $(SPLIT_EXAMPLES) \ - $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(srcdir)/tutorial/tutorial.hh \ $(srcdir)/ref_guide/ref_guide.hh @@ -454,10 +448,10 @@ technical: technical-html technical-pdf technical_dir = $(doc_dir)/technical -# FIXME: Check these dependencies. And it'd be better to depend on -# actual files rather than timestamps corresponding to a bunch of -# files. -technical_dependencies = $(PNG_FIGURES) $(DOC_PACKAGES) +technical_dependencies = \ + $(TECHNICAL_EXAMPLES) \ + $(PNG_FIGURES) \ + $(DOC_PACKAGES) # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: @@ -557,12 +551,10 @@ tutorial: tutorial-html tutorial-pdf tutorial_dir = $(doc_dir)/tutorial -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. tutorial_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) @@ -755,12 +747,10 @@ ref-guide: ref-guide-html ref-guide-pdf ref_guide_dir = $(doc_dir)/ref_guide -# FIXME: Check these dependencies. -# 1. They might be redundant. -# 2. It'd be better to depend on actual files rather than timestamps -# corresponding to a bunch of files. ref_guide_dependencies = \ + $(EXAMPLES) \ $(SPLIT_EXAMPLES) \ + $(OUTPUTS) \ $(SPLIT_OUTPUTS) \ $(PNG_FIGURES) \ $(DOC_PACKAGES) -- 1.5.6.5