* doc/Makefile.am ($(USER_REFMAN_PDF), $(USER_REFMAN_HTML))
($(DEVEL_REFMAN_PDF), $(DEVEL_REFMAN_HTML))
* doc/ref_guide/Makefile.am ($(REF_GUIDE_HH), $(REF_GUIDE_PDF))
* doc/tutorial/Makefile.am ($(TUTORIAL_HH), $(TUTORIAL_PDF)):
Depend on $(srcdir)/figures.stamp instead of $(FIGURES_BUILDDIR).
Shorten actions.
* doc/white_paper/Makefile.am ($(WHITE_PAPER_PDF)):
Add missing dependencies.
Shorten actions.
($(WHITE_PAPER_HTML)): Simplify dependency name.
---
milena/ChangeLog | 15 +++++++++++++++
milena/doc/Makefile.am | 24 ++++++++++++++++--------
milena/doc/ref_guide/Makefile.am | 15 +++++++--------
milena/doc/tutorial/Makefile.am | 15 +++++++--------
milena/doc/white_paper/Makefile.am | 10 +++++-----
5 files changed, 50 insertions(+), 29 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 51ca591..c4eaf15 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,18 @@
+2009-06-25 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Improve build dependencies in doc/.
+
+ * doc/Makefile.am ($(USER_REFMAN_PDF), $(USER_REFMAN_HTML))
+ ($(DEVEL_REFMAN_PDF), $(DEVEL_REFMAN_HTML))
+ * doc/ref_guide/Makefile.am ($(REF_GUIDE_HH), $(REF_GUIDE_PDF))
+ * doc/tutorial/Makefile.am ($(TUTORIAL_HH), $(TUTORIAL_PDF)):
+ Depend on $(srcdir)/figures.stamp instead of $(FIGURES_BUILDDIR).
+ Shorten actions.
+ * doc/white_paper/Makefile.am ($(WHITE_PAPER_PDF)):
+ Add missing dependencies.
+ Shorten actions.
+ ($(WHITE_PAPER_HTML)): Simplify dependency name.
+
2009-06-25 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr>
Various fixes in documentation.
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 90685e4..a7664ed 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -67,26 +67,34 @@ ref_guide/ref_guide.hh: fig-convert
# Doxygen PDF documentation outputs.
USER_REFMAN_PDF = user/latex/refman.pdf
ref-doc-pdf: $(USER_REFMAN_PDF)
-$(USER_REFMAN_PDF): Doxyfile_user_pdf $(FIGURES_BUILDDIR) $(EXTRA_DEPS)
- $(DOXYGEN) Doxyfile_user_pdf
+# FIXME: Split in two rules: one generating the LaTeX file from the
+# Doxyfile, and another one generating the PDF from the LaTeX source.
+# Moreover, the LaTeX to PDF rule could be factored using a suffix
+# rule (as in LRDE's share/).
+$(USER_REFMAN_PDF): Doxyfile_user_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS)
+ $(DOXYGEN) $<
cd user/latex && make pdf
USER_REFMAN_HTML = user/html
ref-doc-html: $(USER_REFMAN_HTML)
-$(USER_REFMAN_HTML): Doxyfile_user $(FIGURES_BUILDDIR) $(EXTRA_DEPS)
- $(DOXYGEN) Doxyfile_user
+$(USER_REFMAN_HTML): Doxyfile_user $(srcdir)/figures.stamp $(EXTRA_DEPS)
+ $(DOXYGEN) $<
# Doxygen HTML documentation output directories.
DEVEL_REFMAN_PDF = devel/latex/refman.pdf
ref-doc-devel-pdf: $(DEVEL_REFMAN_PDF)
-$(DEVEL_REFMAN_PDF): Doxyfile_devel_pdf $(FIGURES_BUILDDIR) $(EXTRA_DEPS)
- $(DOXYGEN) Doxyfile_devel_pdf
+# FIXME: Split in two rules: one generating the LaTeX file from the
+# Doxyfile, and another one generating the PDF from the LaTeX source.
+# Moreover, the LaTeX to PDF rule could be factored using a suffix
+# rule (as in LRDE's share/).
+$(DEVEL_REFMAN_PDF): Doxyfile_devel_pdf $(srcdir)/figures.stamp $(EXTRA_DEPS)
+ $(DOXYGEN) $<
cd devel/latex && make $(AM_MAKEFLAGS)
DEVEL_REFMAN_HTML = devel/html
ref-doc-devel-html: $(DEVEL_REFMAN_HTML)
-$(DEVEL_REFMAN_HTML): Doxyfile_devel $(FIGURES_BUILDDIR) $(EXTRA_DEPS)
- $(DOXYGEN) Doxyfile_devel
+$(DEVEL_REFMAN_HTML): Doxyfile_devel $(srcdir)/figures.stamp $(EXTRA_DEPS)
+ $(DOXYGEN) $<
# Tutorial.
tutorial-pdf: fig-convert
diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am
index 4079fdd..3ba3098 100644
--- a/milena/doc/ref_guide/Makefile.am
+++ b/milena/doc/ref_guide/Makefile.am
@@ -34,19 +34,18 @@ ref-guide: ref-guide-html ref-guide-pdf
# about `.html' files.
REF_GUIDE_HH = ref_guide.hh
ref-guide-html: $(REF_GUIDE_HH)
-# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR).
-$(REF_GUIDE_HH): $(FIGURES_BUILDDIR)
- $(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/ref_guide.tex $(DOC_BUILDDIR)/ref_guide
$(DOC_SRCDIR)
+$(REF_GUIDE_HH): ref_guide.tex $(srcdir)/../figures.stamp
+ $(DOC_SRCDIR)/tools/todoxygen.sh \
+ $< $(DOC_BUILDDIR)/ref_guide $(DOC_SRCDIR)
# Final product.
REF_GUIDE_PDF = ref_guide.pdf
ref-guide-pdf: $(REF_GUIDE_PDF)
-# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR).
-$(REF_GUIDE_PDF): $(FIGURES_BUILDDIR)
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/ref_guide.tex
+$(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
dist_doc_DATA = $(REF_GUIDE_PDF)
diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am
index dd97040..17d8154 100644
--- a/milena/doc/tutorial/Makefile.am
+++ b/milena/doc/tutorial/Makefile.am
@@ -32,19 +32,18 @@ tutorial: tutorial-html tutorial-pdf
# files.
TUTORIAL_HH = tutorial.hh
tutorial-html: $(TUTORIAL_HH)
-# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR).
-$(TUTORIAL_HH): $(FIGURES_BUILDDIR)
- $(DOC_SRCDIR)/tools/todoxygen.sh $(srcdir)/tutorial.tex $(DOC_BUILDDIR)/tutorial
$(DOC_SRCDIR)
+$(TUTORIAL_HH): tutorial.tex $(srcdir)/../figures.stamp
+ $(DOC_SRCDIR)/tools/todoxygen.sh \
+ $< $(DOC_BUILDDIR)/tutorial $(DOC_SRCDIR)
# Final product.
TUTORIAL_PDF = tutorial.pdf
tutorial-pdf: $(TUTORIAL_PDF)
-# FIXME: Missing dependencies on images from $(FIGURES_BUILDDIR).
-$(TUTORIAL_PDF): $(FIGURES_BUILDDIR)
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/tutorial.tex
+$(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
dist_doc_DATA = $(TUTORIAL_PDF)
diff --git a/milena/doc/white_paper/Makefile.am b/milena/doc/white_paper/Makefile.am
index 6d5d512..322deb8 100644
--- a/milena/doc/white_paper/Makefile.am
+++ b/milena/doc/white_paper/Makefile.am
@@ -40,7 +40,7 @@ white-paper: white-paper-pdf white-paper-html
WHITE_PAPER_HTML = white_paper_html/index.html
white-paper-html: $(WHITE_PAPER_HTML)
-$(WHITE_PAPER_HTML): $(srcdir)/white_paper.tex $(EPSS)
+$(WHITE_PAPER_HTML): white_paper.tex $(EPSS)
test -d white_paper_html || mkdir white_paper_html
TEXINPUTS=$(TEXINPUTS) hevea -O -fix $< -o $@
$(top_srcdir)/milena/doc/tools/clearbanner.sh $@
@@ -48,10 +48,10 @@ $(WHITE_PAPER_HTML): $(srcdir)/white_paper.tex $(EPSS)
WHITE_PAPER_PDF = white_paper.pdf
white-paper-pdf: $(WHITE_PAPER_PDF)
-$(WHITE_PAPER_PDF):
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex
- TEXINPUTS=$(TEXINPUTS) pdflatex $(srcdir)/white_paper.tex
+$(WHITE_PAPER_PDF): white_paper.tex $(PNGS)
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
+ TEXINPUTS=$(TEXINPUTS) pdflatex $<
dist_doc_DATA = \
--
1.6.2.4