* doc/Makefile.am: convert reference figure to the right format before generating the doc. * doc/examples/Makefile.am: compile examples only if requested. There are not compile thanks to the 'all' rule. --- milena/ChangeLog | 10 ++++++++++ milena/doc/Makefile.am | 12 ++++++------ milena/doc/examples/Makefile.am | 35 +++++++++++++++++++---------------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4ae66d8..7267a17 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-06-15 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Fix few dependencies related to the documentation. + + * doc/Makefile.am: convert reference figure to the right format before + generating the doc. + + * doc/examples/Makefile.am: compile examples only if requested. There + are not compile thanks to the 'all' rule. + +2009-06-15 Guillaume Lazzara <guillaume.lazzara@lrde.epita.fr> + Comments parts of the documentation related to fun_image. * doc/examples/tuto4_genericity_and_algorithms.cc, diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 7d20939..d8078fe 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -59,9 +59,9 @@ doc-devel-html: tutorial-html ref-guide-html white-paper-html ref-doc-devel-html # complicated. Simplify. # Shared dependencies on the products of tutorial/ and ref_guide/. EXTRA_DEPS = tutorial/tutorial.hh ref_guide/ref_guide.hh -tutorial/tutorial.hh: +tutorial/tutorial.hh: fig-convert cd tutorial && $(MAKE) $(AM_MAKEFLAGS) tutorial.hh -ref_guide/ref_guide.hh: +ref_guide/ref_guide.hh: fig-convert cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) ref_guide.hh # Doxygen PDF documentation outputs. @@ -89,9 +89,9 @@ $(DEVEL_REFMAN_HTML): Doxyfile_devel $(FIGURES_BUILDDIR) $(EXTRA_DEPS) $(DOXYGEN) Doxyfile_devel # Tutorial. -tutorial-pdf: +tutorial-pdf: fig-convert cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@ -tutorial-html: +tutorial-html: fig-convert cd tutorial && $(MAKE) $(AM_MAKEFLAGS) $@ # White Paper. @@ -102,10 +102,10 @@ white-paper-html: cd white_paper && $(MAKE) $(AM_MAKEFLAGS) $@ # Reference Guide. -ref-guide-pdf: +ref-guide-pdf: fig-convert cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ -ref-guide-html: +ref-guide-html: fig-convert cd ref_guide && $(MAKE) $(AM_MAKEFLAGS) $@ diff --git a/milena/doc/examples/Makefile.am b/milena/doc/examples/Makefile.am index 356336e..3ba5630 100644 --- a/milena/doc/examples/Makefile.am +++ b/milena/doc/examples/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/milena/doc/doc.mk -noinst_PROGRAMS = \ +EXTRA_PROGRAMS = \ accu-right-instanciation \ borderthickness \ box2d-bbox \ @@ -63,21 +63,22 @@ noinst_PROGRAMS = \ win-create-1 \ win-create-2 -noinst_PROGRAMS += \ -tuto2_first_image \ -tuto3_rw_image \ -tuto4_genericity_and_algorithms +EXTRA_PROGRAMS += \ + tuto2_first_image \ + tuto3_rw_image \ + tuto4_genericity_and_algorithms # Tuto3 -noinst_PROGRAMS += \ -tuto3_colorize \ -tuto3_println \ -tuto3_trace +EXTRA_PROGRAMS += \ + tuto3_colorize \ + tuto3_println \ + tuto3_trace # Tuto4 -noinst_PROGRAMS += \ -tuto4_point2d \ -tuto4_site_set_create +EXTRA_PROGRAMS += \ + tuto4_point2d \ + tuto4_site_set_create + accu_right_instanciation_SOURCES = accu-right-instanciation.cc borderthickness_SOURCES = borderthickness.cc @@ -134,11 +135,13 @@ tuto3_trace_SOURCES = tuto3/trace.cc tuto4_site_set_create_SOURCES = tuto4/site_set_create.cc tuto4_point2d_SOURCES = tuto4/point2d.cc -.PHONY : run-examples examples diff-data fix-refdata split-examples \ - split-outputs +.PHONY : examples run-examples diff-data fix-refdata \ + split-examples split-outputs + +examples: $(EXTRA_PROGRAMS) -run-examples: +run-examples: examples mkdir -p $(OUTPUTS_BUILDDIR) mkdir -p $(FIGURES_BUILDDIR) @failcom='exit 1'; \ @@ -148,7 +151,7 @@ run-examples: done -data-regen: run-examples split-examples split-outputs diff-data +data-regen: examples run-examples split-examples split-outputs diff-data diff-data: run-examples split-examples -- 1.5.6.5