[Olena-patches] [PATCH 05/10] Help make to regen doc/figures.stamp from subdirectories of doc/.

* doc/tutorial/Makefile.am ($(srcdir)/../figures.stamp) * doc/ref_guide/Makefile.am ($(srcdir)/../figures.stamp): New rules. --- milena/ChangeLog | 8 ++++++++ milena/doc/ref_guide/Makefile.am | 9 +++++++++ milena/doc/tutorial/Makefile.am | 10 ++++++++++ 3 files changed, 27 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ca94bc7..6b982e0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-06-26 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Help make to regen doc/figures.stamp from subdirectories of doc/. + + * doc/tutorial/Makefile.am ($(srcdir)/../figures.stamp) + * doc/ref_guide/Makefile.am ($(srcdir)/../figures.stamp): + New rules. + +2009-06-26 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + Fix path to build-aux/generate_dist_headers.sh in Makefile. * Makefile.am (regen-am, $(srcdir)/headers.mk): Here. diff --git a/milena/doc/ref_guide/Makefile.am b/milena/doc/ref_guide/Makefile.am index b6bb701..6564d5c 100644 --- a/milena/doc/ref_guide/Makefile.am +++ b/milena/doc/ref_guide/Makefile.am @@ -47,6 +47,15 @@ $(REF_GUIDE_PDF): ref_guide.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< +# FIXME: Regenerating figures.stamp requires make to go back to the +# parent directory. We already do the opposite (descending from +# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update +# tutorial.hh). This is not sound. We probably want to put together +# somes of these files, and maybe get rid of some directories, or at +# least move most of the Makefile machinery into +# milena/doc/Makefile.am. +$(srcdir)/../figures.stamp: + cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert dist_doc_DATA = $(REF_GUIDE_PDF) diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index debd706..0fb2333 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -45,6 +45,16 @@ $(TUTORIAL_PDF): tutorial.tex $(srcdir)/../figures.stamp TEXINPUTS=$(TEXINPUTS) pdflatex $< TEXINPUTS=$(TEXINPUTS) pdflatex $< +# FIXME: Regenerating figures.stamp requires make to go back to the +# parent directory. We already do the opposite (descending from +# milena/doc/ to milena/doc/tutorial/Makefile in milena/doc/ to update +# tutorial.hh). This is not sound. We probably want to put together +# somes of these files, and maybe get rid of some directories, or at +# least move most of the Makefile machinery into +# milena/doc/Makefile.am. +$(srcdir)/../figures.stamp: + cd .. && $(MAKE) $(AM_MAKEFLAGS) fig-convert + dist_doc_DATA = $(TUTORIAL_PDF) EXTRA_DIST = \ -- 1.6.3.1