* doc/ref_guide/ref_guide.mk (ref_guide_dependencies): New variable. Use it to define dependencies of... ($(REF_GUIDE_HH), $(REF_GUIDE_PDF)): ...these targets. * doc/technical/technical.mk (technical_dependencies): New variable. Use it to define dependencies of... ($(TECHNICAL_HH), $(TECHNICAL_PDF)): ...these targets. * doc/tutorial/tutorial.mk (tutorial_dependencies): New variable. Use it to define dependencies of... ($(TUTORIAL_HH), $(TUTORIAL_PDF)): ...these targets. --- milena/ChangeLog | 20 ++++++++++++++++++++ milena/doc/ref_guide/ref_guide.mk | 13 +++++++++++-- milena/doc/technical/technical.mk | 9 +++++++-- milena/doc/tutorial/tutorial.mk | 14 +++++++++++--- 4 files changed, 49 insertions(+), 7 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b69f66f..dabbddb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,25 @@ 2010-03-12 Roland Levillain <roland@lrde.epita.fr> + Improve dependencies of some documentation products. + + * doc/ref_guide/ref_guide.mk (ref_guide_dependencies): + New variable. + Use it to define dependencies of... + ($(REF_GUIDE_HH), $(REF_GUIDE_PDF)): + ...these targets. + * doc/technical/technical.mk (technical_dependencies): + New variable. + Use it to define dependencies of... + ($(TECHNICAL_HH), $(TECHNICAL_PDF)): + ...these targets. + * doc/tutorial/tutorial.mk (tutorial_dependencies): + New variable. + Use it to define dependencies of... + ($(TUTORIAL_HH), $(TUTORIAL_PDF)): + ...these targets. + +2010-03-12 Roland Levillain <roland@lrde.epita.fr> + Revamp the Makefile machinery in milena/doc/examples/. * doc/gen-examples-outputs-mk: New script. diff --git a/milena/doc/ref_guide/ref_guide.mk b/milena/doc/ref_guide/ref_guide.mk index 1a9ff12..d776b2f 100644 --- a/milena/doc/ref_guide/ref_guide.mk +++ b/milena/doc/ref_guide/ref_guide.mk @@ -27,6 +27,15 @@ 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 +# correponding to a bunch of files. +ref_guide_dependencies = \ + $(doc_dir)/split-examples.stamp \ + $(doc_dir)/split-outputs.stamp \ + $(doc_dir)/figures.stamp + # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -59,14 +68,14 @@ ref_guide_dir = $(doc_dir)/ref_guide # files. REF_GUIDE_HH = $(ref_guide_dir)/ref_guide.hh ref-guide-html: $(REF_GUIDE_HH) -$(REF_GUIDE_HH): $(ref_guide_dir)/ref_guide.tex $(doc_dir)/figures.stamp +$(REF_GUIDE_HH): $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) $(doc_dir)/tools/todoxygen.sh $< $(ref_guide_dir) $(doc_dir) # Final product. REF_GUIDE_PDF = $(ref_guide_dir)/ref_guide.pdf ref-guide-pdf: $(REF_GUIDE_PDF) -$(REF_GUIDE_PDF): $(ref_guide_dir)/ref_guide.tex $(doc_dir)/figures.stamp +$(REF_GUIDE_PDF): $(ref_guide_dir)/ref_guide.tex $(ref_guide_dependencies) TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< TEXINPUTS=$(ref_guide_TEXINPUTS) pdflatex $< \ diff --git a/milena/doc/technical/technical.mk b/milena/doc/technical/technical.mk index 56fcf71..8c5ccea 100644 --- a/milena/doc/technical/technical.mk +++ b/milena/doc/technical/technical.mk @@ -27,6 +27,11 @@ 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 correponding to a bunch of +# files. +technical_dependencies = $(doc_dir)/figures.stamp + # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -59,14 +64,14 @@ technical_dir = $(doc_dir)/technical # about `.html' files. TECHNICAL_HH = $(technical_dir)/technical.hh technical-html: $(TECHNICAL_HH) -$(TECHNICAL_HH): $(technical_dir)/technical.tex $(doc_dir)/figures.stamp +$(TECHNICAL_HH): $(technical_dir)/technical.tex $(technical_dependencies) $(doc_dir)/tools/todoxygen.sh $< $(technical_dir) $(doc_dir) # Final product. TECHNICAL_PDF = $(technical_dir)/technical.pdf technical-pdf: $(TECHNICAL_PDF) -$(TECHNICAL_PDF): $(technical_dir)/technical.tex $(doc_dir)/figures.stamp +$(TECHNICAL_PDF): $(technical_dir)/technical.tex $(technical_dependencies) TEXINPUTS=$(technical_TEXINPUTS) pdflatex $< TEXINPUTS=$(technical_TEXINPUTS) pdflatex $< TEXINPUTS=$(technical_TEXINPUTS) pdflatex $< \ diff --git a/milena/doc/tutorial/tutorial.mk b/milena/doc/tutorial/tutorial.mk index 6cc6ef4..7f65365 100644 --- a/milena/doc/tutorial/tutorial.mk +++ b/milena/doc/tutorial/tutorial.mk @@ -27,6 +27,15 @@ 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 +# correponding to a bunch of files. +tutorial_dependencies = \ + $(doc_dir)/split-examples.stamp \ + $(doc_dir)/split-outputs.stamp \ + $(doc_dir)/figures.stamp + # FIXME: As in milena/doc/Makefile.am, we should probably strip # $(srcdir) prefixes from target variables, e.g. instead of: # @@ -59,14 +68,13 @@ tutorial_dir = $(doc_dir)/tutorial # files. TUTORIAL_HH = $(tutorial_dir)/tutorial.hh tutorial-html: $(TUTORIAL_HH) -$(TUTORIAL_HH): $(tutorial_dir)/tutorial.tex $(doc_dir)/figures.stamp +$(TUTORIAL_HH): $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) $(doc_dir)/tools/todoxygen.sh $< $(tutorial_dir) $(doc_dir) - # Final product. TUTORIAL_PDF = $(tutorial_dir)/tutorial.pdf tutorial-pdf: $(TUTORIAL_PDF) -$(TUTORIAL_PDF): $(tutorial_dir)/tutorial.tex $(doc_dir)/figures.stamp +$(TUTORIAL_PDF): $(tutorial_dir)/tutorial.tex $(tutorial_dependencies) TEXINPUTS=$(tutorial_TEXINPUTS) pdflatex $< TEXINPUTS=$(tutorial_TEXINPUTS) pdflatex $< TEXINPUTS=$(tutorial_TEXINPUTS) pdflatex $< \ -- 1.5.6.5