* milena/Makefile.am: add target `tutorial'. * milena/doc/Doxyfile.in: Use short file names. * milena/doc/Makefile.am, * milena/doc/tutorial/Makefile.am: add documentation to EXTRA_DIST. --- milena/ChangeLog | 11 ++ milena/Makefile.am | 5 +- milena/doc/Doxyfile.in | 4 +- milena/doc/Makefile.am | 18 ++- milena/doc/tutorial/Makefile.am | 268 ++++++++++++++++++++------------------- 5 files changed, 162 insertions(+), 144 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 43bf51d..35b9b75 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,16 @@ 2008-12-18 Guillaume Lazzara <z@lrde.epita.fr> + Make the tutorial part of the distribution. + + * milena/Makefile.am: add target `tutorial'. + + * milena/doc/Doxyfile.in: Use short file names. + + * milena/doc/Makefile.am, + * milena/doc/tutorial/Makefile.am: add documentation to EXTRA_DIST. + +2008-12-18 Guillaume Lazzara <z@lrde.epita.fr> + Fix few tests. * doc/tutorial/tutorial.tex: add copyright and improve input code diff --git a/milena/Makefile.am b/milena/Makefile.am index 485c4bd..8e71f41 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -8,10 +8,13 @@ SUBDIRS = \ tools # apps -.PHONY: doc +.PHONY: doc tutorial doc: $(MAKE) -C doc doc +tutorial: + $(MAKE) -C doc tutorial + include $(top_srcdir)/milena/headers.mk EXTRA_DIST = \ diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index bc28c77..64fd5b8 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -13,11 +13,11 @@ REPEAT_BRIEF = YES ABBREVIATE_BRIEF = ALWAYS_DETAILED_SEC = YES INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = YES +FULL_PATH_NAMES = NO STRIP_FROM_PATH = @top_srcdir@/milena \ @top_builddir@/milena STRIP_FROM_INC_PATH = -SHORT_NAMES = NO +SHORT_NAMES = YES JAVADOC_AUTOBRIEF = NO MULTILINE_CPP_IS_BRIEF = NO DETAILS_AT_TOP = NO diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 91a9700..39b52fd 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -6,13 +6,13 @@ SUBDIRS = tutorial DOXYGEN = doxygen -.PHONY: doc user-doc complete-doc html_complete html_user tuto +.PHONY: doc user-doc complete-doc html_complete html_user tutorial -doc: complete-doc +doc: user-doc complete-doc: html_complete -user-doc: html_user tuto +user-doc: html_user html_complete: Doxyfile tuto_html $(DOXYGEN) Doxyfile_complete @@ -23,8 +23,8 @@ html_user: Doxyfile tuto_html tuto_html: $(MAKE) -C tutorial tuto_html -tuto: all - $(MAKE) -C tutorial tuto +tutorial: all + $(MAKE) -C tutorial tutorial fix-refdata: $(MAKE) -C tutorial fix-refdata @@ -55,10 +55,12 @@ edit_user = sed -e 's,OUTPUT_DIRECTORY = ./complete/,OUTPUT_DIRECTORY -EXTRA_DIST = Doxyfile.in +EXTRA_DIST = \ +Doxyfile.in -CLEANFILES = Doxyfile_complete \ - Doxyfile_user +CLEANFILES = \ +Doxyfile_complete \ +Doxyfile_user # Sed is used to generate Doxyfile from Doxyfile.in instead of # configure, because the former is way faster than the latter. diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 1ce13a1..ba26fe4 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS = samples -.PHONY: tuto tuto_html +.PHONY: tutorial tuto_html include $(top_srcdir)/milena/doc/doc.mk TEXINPUTS = $(TUTORIAL_SRCDIR):$(TUTORIAL_BUILDDIR):$(OUTPUTS_SRCDIR): -tuto: data fig-convert +tutorial: data fig-convert TEXINPUTS=$(TEXINPUTS) pdflatex $(TUTORIAL_SRCDIR)/tutorial.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(TUTORIAL_SRCDIR)/tutorial.tex TEXINPUTS=$(TEXINPUTS) pdflatex $(TUTORIAL_SRCDIR)/tutorial.tex @@ -36,146 +36,148 @@ clean-local: rm -f tutorial.pdf rm -f *.haux *.hh *.html *.htoc -EXTRA_DIST = tutorial.tex +EXTRA_DIST = \ +tutorial.tex \ +tutorial.pdf -EXTRA_DIST += \ -examples/cpp_issue.cc \ -examples/sub_image.cc \ -examples/sub_image_if.cc \ -examples/p_vaccess.cc \ -examples/win_multiple.cc \ -examples/image2d.cc \ -examples/image_plain.cc \ -examples/p_run.cc \ -examples/proxy.cc \ -examples/p_array.2.cc \ -examples/for_Z.cc \ -examples/image_if.cc \ -examples/p_key.cc \ -examples/p_mutable_array_of.cc \ -examples/p_queue.cc \ -examples/image_flat.cc \ -examples/p_image.cc \ -examples/box.cc \ -examples/p_line2d.cc \ -examples/p_array.cc \ -examples/accu.cc \ -examples/p_key.2.cc \ -examples/window.cc \ -examples/image_safe.cc \ +EXTRA_DIST += \ +examples/cpp_issue.cc \ +examples/sub_image.cc \ +examples/sub_image_if.cc \ +examples/p_vaccess.cc \ +examples/win_multiple.cc \ +examples/image2d.cc \ +examples/image_plain.cc \ +examples/p_run.cc \ +examples/proxy.cc \ +examples/p_array.2.cc \ +examples/for_Z.cc \ +examples/image_if.cc \ +examples/p_key.cc \ +examples/p_mutable_array_of.cc \ +examples/p_queue.cc \ +examples/image_flat.cc \ +examples/p_image.cc \ +examples/box.cc \ +examples/p_line2d.cc \ +examples/p_array.cc \ +examples/accu.cc \ +examples/p_key.2.cc \ +examples/window.cc \ +examples/image_safe.cc \ examples/vec.cc -EXTRA_DIST += \ -figures/ima2d-rot-2.ppm \ -figures/logical-not-2.pbm \ -figures/fill-subdomain-2.ppm \ -figures/labeling-compute-2.ppm \ -figures/ima2d-rot-1.ppm \ -figures/fill-subdomain-3.ppm \ -figures/logical-not-1.pbm \ -figures/ima_save.pbm \ +EXTRA_DIST += \ +figures/ima2d-rot-2.ppm \ +figures/logical-not-2.pbm \ +figures/fill-subdomain-2.ppm \ +figures/labeling-compute-2.ppm \ +figures/ima2d-rot-1.ppm \ +figures/fill-subdomain-3.ppm \ +figures/logical-not-1.pbm \ +figures/ima_save.pbm \ figures/fill-subimage-cfun-1.ppm \ -figures/fill-subdomain-4.ppm \ -figures/logical-not-3.pbm \ -figures/labeling-compute-1.pbm \ +figures/fill-subdomain-4.ppm \ +figures/logical-not-3.pbm \ +figures/labeling-compute-1.pbm \ figures/fill-subdomain-1.pbm -EXTRA_DIST += \ -outputs/win-create-1-display.txt \ -outputs/win-create-2.txt \ -outputs/accu-right-instanciation.txt \ -outputs/ima2d-1.txt \ -outputs/borderthickness.txt \ -outputs/ima-save.txt \ -outputs/fill-subimage-cfun.txt \ -outputs/labeling-compute.txt \ -outputs/parray-display-1.txt \ -outputs/fill-subdomain-shorter.txt \ -outputs/dpoint-1.txt \ -outputs/forall-piter.txt \ -outputs/predicate-1.txt \ -outputs/box2d-bbox.txt \ -outputs/graph-iter.txt \ -outputs/graph-output-1.txt \ -outputs/fill-call-1.txt \ -outputs/ima2d-rot.txt \ -outputs/paste-call-1.txt \ -outputs/fun-p2v-1.txt \ -outputs/estim-sites.txt \ -outputs/parray-append.txt \ -outputs/fill-subdomain.txt \ -outputs/ima-size.txt \ -outputs/logical-not.txt \ -outputs/ima2d-display-output-2.txt \ -outputs/ima2d-decl-2.txt \ -outputs/paste.txt \ -outputs/ima2d-6-clone.txt \ -outputs/ima2d-7.txt \ -outputs/parray-bbox.txt \ -outputs/domain-display.txt \ -outputs/ima2d-display-1.txt \ -outputs/win-create-1.txt \ -outputs/ima2d-display-2.txt \ -outputs/ima2d-display-output-1.txt \ -outputs/fill-part-image.txt \ -outputs/ima2d-3-output.txt \ -outputs/ima-has.txt \ -outputs/ima2d-5.txt \ -outputs/ima2d-4.txt \ -outputs/mln_var.txt \ -outputs/fill.txt \ -outputs/point-1.txt \ -outputs/extension-ignore.txt \ -outputs/graph-data.txt \ -outputs/ima2d-2.txt \ +EXTRA_DIST += \ +outputs/win-create-1-display.txt \ +outputs/win-create-2.txt \ +outputs/accu-right-instanciation.txt \ +outputs/ima2d-1.txt \ +outputs/borderthickness.txt \ +outputs/ima-save.txt \ +outputs/fill-subimage-cfun.txt \ +outputs/labeling-compute.txt \ +outputs/parray-display-1.txt \ +outputs/fill-subdomain-shorter.txt \ +outputs/dpoint-1.txt \ +outputs/forall-piter.txt \ +outputs/predicate-1.txt \ +outputs/box2d-bbox.txt \ +outputs/graph-iter.txt \ +outputs/graph-output-1.txt \ +outputs/fill-call-1.txt \ +outputs/ima2d-rot.txt \ +outputs/paste-call-1.txt \ +outputs/fun-p2v-1.txt \ +outputs/estim-sites.txt \ +outputs/parray-append.txt \ +outputs/fill-subdomain.txt \ +outputs/ima-size.txt \ +outputs/logical-not.txt \ +outputs/ima2d-display-output-2.txt \ +outputs/ima2d-decl-2.txt \ +outputs/paste.txt \ +outputs/ima2d-6-clone.txt \ +outputs/ima2d-7.txt \ +outputs/parray-bbox.txt \ +outputs/domain-display.txt \ +outputs/ima2d-display-1.txt \ +outputs/win-create-1.txt \ +outputs/ima2d-display-2.txt \ +outputs/ima2d-display-output-1.txt \ +outputs/fill-part-image.txt \ +outputs/ima2d-3-output.txt \ +outputs/ima-has.txt \ +outputs/ima2d-5.txt \ +outputs/ima2d-4.txt \ +outputs/mln_var.txt \ +outputs/fill.txt \ +outputs/point-1.txt \ +outputs/extension-ignore.txt \ +outputs/graph-data.txt \ +outputs/ima2d-2.txt \ outputs/ima2d-3.txt -EXTRA_DIST += \ -samples/paste-call-1.cc \ -samples/dpoint-1.cc \ -samples/parray-append.cc \ -samples/ima-load.cc.raw \ -samples/ima2d-restricted-1.cc.raw \ -samples/graph-iter.cc \ -samples/labeling-compute.cc \ -samples/ima2d-7.cc \ -samples/ima2d-restricted-2.cc.raw \ -samples/fill-subimage-cfun.cc \ -samples/ima-save.cc \ -samples/point-1.cc \ -samples/box2d-bbox.cc \ -samples/forall-piter.cc \ -samples/ima-size.cc \ -samples/borderthickness.cc \ -samples/Makefile.in \ -samples/ima-has.cc \ -samples/win-create-1.cc \ +EXTRA_DIST += \ +samples/paste-call-1.cc \ +samples/dpoint-1.cc \ +samples/parray-append.cc \ +samples/ima-load.cc.raw \ +samples/ima2d-restricted-1.cc.raw \ +samples/graph-iter.cc \ +samples/labeling-compute.cc \ +samples/ima2d-7.cc \ +samples/ima2d-restricted-2.cc.raw \ +samples/fill-subimage-cfun.cc \ +samples/ima-save.cc \ +samples/point-1.cc \ +samples/box2d-bbox.cc \ +samples/forall-piter.cc \ +samples/ima-size.cc \ +samples/borderthickness.cc \ +samples/Makefile.in \ +samples/ima-has.cc \ +samples/win-create-1.cc \ samples/accu-wrong-instanciation.cc.raw \ -samples/accu-right-instanciation.cc \ -samples/ima2d-5.cc \ -samples/fill-subdomain.cc \ -samples/fill-subdomain-shorter.cc \ -samples/ima2d-2.cc \ -samples/extension-ignore.cc \ -samples/Makefile.am \ -samples/parray-bbox.cc \ -samples/graph-data.cc \ -samples/mln_var.cc \ -samples/ima2d-4.cc \ -samples/predicate-1.cc \ -samples/ima2d-3.cc \ -samples/ima2d-1.cc \ -samples/estim-sites.cc \ -samples/ima2d-6-clone.cc \ -samples/ima2d-restricted-3.cc.raw \ -samples/logical-not.cc \ -samples/fun-p2v-1.cc \ -samples/ima2d-rot.cc \ -samples/fill-part-image.cc \ -samples/domain-display.cc \ -samples/paste.cc \ -samples/fill.cc \ -samples/fill-call-1.cc \ +samples/accu-right-instanciation.cc \ +samples/ima2d-5.cc \ +samples/fill-subdomain.cc \ +samples/fill-subdomain-shorter.cc \ +samples/ima2d-2.cc \ +samples/extension-ignore.cc \ +samples/Makefile.am \ +samples/parray-bbox.cc \ +samples/graph-data.cc \ +samples/mln_var.cc \ +samples/ima2d-4.cc \ +samples/predicate-1.cc \ +samples/ima2d-3.cc \ +samples/ima2d-1.cc \ +samples/estim-sites.cc \ +samples/ima2d-6-clone.cc \ +samples/ima2d-restricted-3.cc.raw \ +samples/logical-not.cc \ +samples/fun-p2v-1.cc \ +samples/ima2d-rot.cc \ +samples/fill-part-image.cc \ +samples/domain-display.cc \ +samples/paste.cc \ +samples/fill.cc \ +samples/fill-call-1.cc \ samples/win-create-2.cc EXTRA_DIST += \ -- 1.5.6.5