GitLab

	* doc/Makefile.am (EXAMPLES): Remove this variable that used to be
	populated by hand.
	Include ($(srcdir)/examples.mk).
	($(srcdir)/examples.mk): New target.
	(EXTRA_DIST): Add $(EXAMPLES).
	(regen-examples-mk): New (phony) target.
	(regen-am): Remake regen-examples-mk.
	* doc/examples.mk: New (generated) Make helper.

	* bootstrap: Here.

	* gen-make-variable: New script.
	* doc/Makefile.am: Include $(srcdir)/pbm-figures.mk,
	($(srcdir)/pgm-figures.mk and $(srcdir)/ppm-figures.mk.
	($(srcdir)/pbm-figures.mk)
	($(srcdir)/pgm-figures.mk)
	($(srcdir)/ppm-figures.mk):
	New targets.
	(EXTRA_DIST): Add $(PBM_FIGURES), $(PGM_FIGURES), $(PPM_FIGURES).
	(regen-pbm-figures-mk)
	(regen-pgm-figures-mk)
	(regen-ppm-figures-mk):
	New (phony target).
	(regen-am): Remake regen-pbm-figures-mk, regen-pgm-figures-mk and
	regen-ppm-figures-mk instead of calling generate_dist_files.sh to
	convert figures.
	($(srcdir)/headers.stamp): No longer call generate_dist_files.sh to
	convert figures.
	(convert_to_png): New variable.
	(SUFFIXES): Add .pbm, .pgm, .ppm and .png.
	(.pbm.png, .pgm.png, .ppm.png): New suffix rules.
	(PNG_FIGURES): New variable.
	(EXTRA_DIST, MAINTAINERCLEANFILES): Add $(PNG_FIGURES).
	(refman_dependencies):
	Remove $(srcdir)/figures.stamp.
	Add $(PNG_FIGURES).
	(technical_dependencies)
	(tutorial_dependencies)
	(ref_guide_dependencies):
	Likewise.
	No longer include $(srcdir)/figures/figures.mk.
	($(srcdir)/figures/figures.mk, $(srcdir)/figures.stamp):
	Remove rules.
	(EXTRA_DIST, MAINTAINERCLEANFILES):
	Remove $(srcdir)/figures.stamp.
	(EXTRA_DIST): Add gen-make-variable.
	* pbm-figures.mk, pgm-figures.mk, ppm-figures.mk:
	New (generated) Make helpers.
	* figures/figures.mk: Remove.

	* doc/Makefile.am (regen-examples-outputs-mk): New (phony) target.
	(regen-am): Invoke regen-examples-outputs-mk.

	* doc/Makefile.am (EXTRA_DIST): Add gen-examples-outputs-mk.

	* doc/Makefile.am
	($(TECHNICAL_HTML_OUTPUTS))
	($(TUTORIAL_HTML_OUTPUTS))
	($(WHITE_PAPER_HTML_OUTPUTS))
	($(REF_GUIDE_HTML_OUTPUTS)):
	Fix tests on targets.

	* doc/Makefile.am (EXTRA_DIST, MAINTAINERCLEANFILES):
	Add $(srcdir)/user-refman.stamp, $(srcdir)/devel-refman.stamp,
	$(srcdir)/figures.stamp, $(srcdir)/split-examples.stamp and
	$(srcdir)/split-outputs.stamp.

	* doc/Makefile.am (CLEANFILES): Remove
	$(technical_dir)/technical.haux,
	$(tutorial_dir)/tutorial.haux,
	$(ref_guide_dir)/ref_guide.haux and
	$(ref_guide_dir)/ref_guide.htoc.
	(clean-local): Remove (phony) target.
	($(EPSS)): Move...
	(MAINTAINERCLEANFILES): ...here.
	Add $(TECHNICAL_PDF), $(TECHNICAL_HH),
	$(TUTORIAL_PDF), $(TUTORIAL_HH),
	$(WHITE_PAPER_PDF)
	$(REF_GUIDE_PDF) and $(REF_GUIDE_HH).

	* doc/tools/todoxygen.sh: Take an output file as second argument
	instead of an output directory.
	* doc/Makefile.am
	($(TECHNICAL_HH), $(TUTORIAL_HH), $(REF_GUIDE_HH)): Adjust.
	Use a temporary file to prevent  todoxygen.sh from generating
	incomplete outputs.

	* doc/tools/todoxygen.sh: Here.

	* build-aux/tex.mk (.tex.html): Remove this rule, since (TeX4ht)
	HTML outputs may contain more than one file (e.g., CSS style
	sheets, images, etc.).
	(SUFFIXES): Remove .html.

	* doc/Makefile.am
	(TECHNICAL_HTML_OUTPUTS, TUTORIAL_HTML_OUTPUTS)
	(WHITE_PAPER_HTML_OUTPUTS, REF_GUIDE_HTML_OUTPUTS):
	New variables.
	($(TECHNICAL_HTML), $(TUTORIAL_HTML))
	($(WHITE_PAPER_HTML), $(REF_GUIDE_HTML)):
	Remove these targets.
	Superseded by...
	($(TECHNICAL_HTML).stamp, $(TECHNICAL_HTML_OUTPUTS))
	($(TUTORIAL_HTML).stamp, $(TUTORIAL_HTML_OUTPUTS))
	($(WHITE_PAPER_HTML).stamp, $(WHITE_PAPER_HTML_OUTPUTS))
	($(REF_GUIDE_HTML).stamp, $(REF_GUIDE_HTML_OUTPUTS)):
	...these (new) targets.
	(EXTRA_DIST, MAINTAINERCLEANFILES): Add $(TECHNICAL_HTML).stamp,
	($(TUTORIAL_HTML).stamp, $(WHITE_PAPER_HTML).stamp and
	$(REF_GUIDE_HTML).stamp.
	(dist_doc_DATA, MAINTAINERCLEANFILES): Remove $(TECHNICAL_HTML),
	$(TUTORIAL_HTML), $(WHITE_PAPER_HTML) and $(REF_GUIDE_HTML).
	Add $(TECHNICAL_HTML_OUTPUTS), $(TUTORIAL_HTML_OUTPUTS),
	$(WHITE_PAPER_HTML_OUTPUTS) and $(REF_GUIDE_HTML_OUTPUTS).

	* build-aux/tex.mk (TEXI2HTML): Add --tex4ht.
	* bootstrap (tempdir): Check for TeX4HT, dvipng and convert (from
	ImageMagick).

	* doc/Makefile.am
	(TEXI2DVI_FLAGS): Add -I $(DOC_SRCDIR)/white_paper.
	($(TECHNICAL_PDF), $(TUTORIAL_PDF))
	($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)):
	Reduce these rules to a list of extra dependencies and let the
	generic tex-to-html rule do the job.

	* build-aux/tex.mk (SUFFIXES): Add .html.
	(.tex.html): New rule.
	(TEXI2HTML, TEXI2HTML_FLAGS): New variables.

	* configure.ac: Remove option `foreign'.
	Pass option `subdir-objects'.

	* bootstrap (require): Take a flag as an optional second argument.
	Use it to check for HeVeA 1.10.

	* doc/tools/todoxygen.sh: Take a HTML file as input instead of a
	LaTeX one.
	* doc/Makefile.am (DOC_PACKAGES): New variable.
	(TECHNICAL_HTML, TUTORIAL_HTML, REF_GUIDE_HTML):
	New variables.
	($(TECHNICAL_HTML), $(TUTORIAL_HTML), $(REF_GUIDE_HTML)):
	New targets.
	(dist_doc_DATA): Add $(TECHNICAL_HTML), $(TUTORIAL_HTML) and
	$(REF_GUIDE_HTML).
	($(TECHNICAL_HH)): Depend on and process $(TECHNICAL_HTML) instead
	of $(technical_dir)/technical.tex.
	($(TUTORIAL_HH)): Depend on and process $(TUTORIAL_HTML) instead
	of $(tutorial_dir)/tutorial.tex.
	($(REF_GUIDE_HH)): Depend on and process $(REF_GUIDE_HTML) instead
	of $(ref_guide_dir)/ref_guide.tex.
	(CLEANFILES): Remove now useless patterns.
	(clean-local): Likewise.
	Adjust paths.

	* doc/Makefile.am (OUTPUTS, EXAMPLES):
	Sort in lexicographical order.
	Remove $(srcdir)/outputs/ima2d-decl-2.txt
	Move $(srcdir)/outputs/graph-output-1.txt,
	$(srcdir)/outputs/ima2d-display-1.txt,
	$(srcdir)/outputs/ima2d-display-2.txt,
	$(srcdir)/outputs/ima2d-display-output-1.txt,
	$(srcdir)/outputs/ima2d-display-output-2.txt,
	$(srcdir)/outputs/parray-display-1.txt and
	$(srcdir)/outputs/win-create-1-display.txt...
	(MORE_OUTPUTS): ...here (new variable).
	* doc/outputs/ima2d-decl-2.txt: Remove.

	* doc/Makefile.am: Include $(top_srcdir)/build-aux/tex.mk.
	(TEXI2DVI_FLAGS): Append -I $(DOC_SRCDIR), -I $(OUTPUTS_SRCDIR),
	-I $(SPLIT_OUTPUTS_SRCDIR), -I $(IMG_SRCDIR) and -I
	$(SPLIT_EXAMPLES_SRCDIR).
	(technical_TEXINPUTS, tutorial_TEXINPUTS)
	(white_paper_TEXINPUTS, ref_guide_TEXINPUTS):
	Remove variables.
	($(TECHNICAL_PDF), $(TUTORIAL_PDF))
	($(WHITE_PAPER_PDF), $(REF_GUIDE_PDF)):
	Reduce these rules to a list of extra dependencies and let the
	generic tex-to-pdf rule do the job.
	($(WHITE_PAPER_HTML)): Adjust rule.

	* build-aux/texi2dvi: New script.
	Imported from Texinfo.
	* build-aux/tex.mk: New Makefile helper.
	Inspired by LRDE share/style/tex.mk.
	* build-aux/Makefile.am (EXTRA_DIST): Add texi2dvi.

	* milena/doc/doc.mk,
	* milena/doc/examples/make.mk,
	* milena/doc/ref_guide/ref_guide.mk,
	* milena/doc/technical/technical.mk,
	* milena/doc/tutorial/tutorial.mk,
	* milena/doc/white_paper/white_paper.mk:
	Remove and inline these files...
	* doc/Makefile.am: ...here.
	Do not include $(top_srcdir)/milena/tests/tests.mk.
	(AM_CPPFLAGS): Add -I$(top_srcdir)/milena and
	-I$(top_builddir)/milena.
	($(DOC_SRCDIR)/examples-outputs.mk): Depend on
	$(srcdir)/Makefile.am instead of $(srcdir)/examples/make.mk.

	* 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.

	* doc/gen-examples-outputs-mk: New script.
	* doc/examples/make.mk (PROGRAMS_examples):
	Sort and remove duplicates.
	(examples_dir): Remove variable.
	(accu_right_instanciation_SOURCES)
	(borderthickness_SOURCES)
	(box2d_bbox_SOURCES)
	(domain_display_SOURCES)
	(dpoint_1_SOURCES)
	(estim_sites_SOURCES)
	(extend_SOURCES)
	(extension_ignore_SOURCES)
	(fill_SOURCES)
	(fill_call_1_SOURCES)
	(fill_imageif_cfun_SOURCES)
	(fill_part_image_SOURCES)
	(fill_subdomain_SOURCES)
	(fill_subdomain_shorter_SOURCES)
	(first_routine_SOURCES)
	(forall_piter_SOURCES)
	(fun_p2v_1_SOURCES)
	(graph_data_SOURCES)
	(graph_iter_SOURCES)
	(ima2d_1_SOURCES)
	(ima2d_2_SOURCES)
	(ima2d_3_SOURCES)
	(ima2d_4_SOURCES)
	(ima2d_5_SOURCES)
	(ima2d_6_clone_SOURCES)
	(ima2d_7_SOURCES)
	(ima2d_rot_SOURCES)
	(ima_has_SOURCES)
	(ima_save_SOURCES)
	(ima_size_SOURCES)
	(labeling_compute_SOURCES)
	(logical_not_SOURCES)
	(mln_var_SOURCES)
	(parray_append_SOURCES)
	(parray_bbox_SOURCES)
	(paste_SOURCES)
	(paste_call_1_SOURCES)
	(point_1_SOURCES)
	(predicate_1_SOURCES)
	(win_create_1_SOURCES)
	(win_create_2_SOURCES)
	(tuto2_first_image_SOURCES)
	(tuto3_rw_image_SOURCES)
	(tuto4_genericity_and_algorithms_SOURCES)
	(tuto3_colorize_SOURCES)
	(tuto3_println_SOURCES)
	(tuto3_trace_SOURCES)
	(tuto4_point2d_SOURCES)
	(tuto4_site_set_create_SOURCES):
	Adjust.
	(data-regen, examples, run-examples)
	Remove (phony) targets.
	(split-examples, split-outputs):
	Likewise.
	Superseded by...
	($(srcdir)/split-examples.stamp, $(srcdir)/split-outputs.stamp):
	...these (new) targets.
	(OUTPUTS, EXAMPLES): New variable.
	($(DOC_SRCDIR)/examples-outputs.mk): New target.
	Include $(DOC_SRCDIR)/examples-outputs.mk.
	(MAINTAINERCLEANFILES): Ad $(OUTPUTS).
	(diff-data, fix-refdata): Remove these (phony) targets, as they
	duplicate services provided by the SCM (Git).
	(clean-local, clean-figures): Remove these targets and add their
	actions...
	* doc/Makefile.am (maintainer-clean-local): ...to this rule.
	(EXTRA_DEPS): Remove variable.
	Superseded by...
	(refman_dependencies): ...this (new) variable.
	($(srcdir)/user-refman.stamp)
	($(srcdir)/devel-refman.stamp):
	Adjust targets' dependencies.
	(fig-convert): Remove (phony) target.
	Clean up.
	* milena/doc/examples-outputs.mk: New (generated file).

	* doc/tools/data.hh.in: New file.
	Use it...
	* doc/examples/ima-save.cc:
	...here, to avoid hard-coded paths.
	* doc/tools/sample_utils.hh: Likewise.
	Adjust header guards.
	* doc/examples/split/ima-save-1.cc.raw: Regen.

	* mln/core/concept/object.hh: Here.

	* doc/Doxyfile.in (OUTPUT_DIRECTORY):
	s,@srcdir@/user/,@builddir@/user-refman.tmp,.
	(EXCLUDE): Adjust.
	* doc/Makefile.am (edit_devel): Adjust.
	($(srcdir)/user-refman.stamp)
	($(srcdir)/devel-refman.stamp)
	(maintainer-clean-local):
	Adjust targets.

	* bootstrap: Here.
	(require): Be more tolerant w.r.t. version messages.

	* doc/Makefile.am (edit, $(DOXYFILE_USER)):
	Move these definitions closer to their use site.
	(edit_devel, $(DOXYFILE_DEVEL)): Likewise.

	* doc/Doxyfile.in: Switch settings to generate the user
	documentation.
	* doc/Makefile.am (edit_user): Remove variable.
	(edit_devel): New variable.
	($(DOXYFILE_USER)): Generate it directly from
	$(srcdir)/$(DOXYFILE).in.
	($(DOXYFILE_DEVEL)): Adjust to use edit_devel.

	* doc/Doxyfile.in (GENERATE_LATEX): Enable.
	(EXCLUDE): Adjust.
	* doc/Makefile.am (ref-doc-html, ref-doc-devel-html):
	Remove (phony) targets.
	(ref-doc, ref-doc-devel):
	New (phony) targets.
	(doc-html, doc-devel-html):
	Adjust targets.
	(DOXYFILE_USER_PDF, DOXYFILE_USER_HTML)
	(DOXYFILE_DEVEL_PDF, DOXYFILE_DEVEL_HTML):
	Remove variables.
	(DOXYFILE_USER_PDF, DOXYFILE_DEVEL):
	New variables.
	(USER_REFMAN_LATEX, USER_REFMAN_HTML)
	(DEVEL_REFMAN_LATEX, DEVEL_REFMAN_HTML):
	Remove variables.
	(USER_REFMAN): New variable.
	(all-local): Adjust.
	($(srcdir)/user-refman-latex.stamp)
	($(srcdir)/$(USER_REFMAN_LATEX))
	($(srcdir)/user-refman-html.stamp)
	($(srcdir)/$(USER_REFMAN_HTML))
	($(srcdir)/devel-refman-latex.stamp)
	($(srcdir)/$(DEVEL_REFMAN_LATEX))
	($(srcdir)/devel-refman-html.stamp)
	($(srcdir)/$(DEVEL_REFMAN_HTML)):
	Remove targets.
	($(srcdir)/user-refman.stamp)
	($(srcdir)/$(USER_REFMAN))
	($(srcdir)/devel-refman.stamp)
	($(srcdir)/$(DEVEL_REFMAN)):
	New targets.
	($(srcdir)/$(USER_REFMAN_PDF), $(srcdir)/$(DEVEL_REFMAN_PDF)):
	Adjust targets.
	(regen-doc, regen-devel-doc): New (phony) targets.
	(clean-user-refman-latex, clean-user-refman-html)
	(clean-devel-refman-latex, clean-devel-refman-html):
	Remove (phony) targets.
	(maintainer-clean-local): Adjust.
	(edit_pdf): Remove variable.
	(EXTRA_DIST): Remove $(USER_REFMAN_HTML).
	Add $(USER_REFMAN)/html.
	(install-data-local, uninstall-local): Adjust.
	(CLEANFILES): Remove Doxyfile_user, Doxyfile_user_pdf,
	Doxyfile_devel, Doxyfile_devel_pdf, devel and user.
	(MAINTAINERCLEANFILES): Add Doxyfile_user and Doxyfile_devel.
	($(DOXYFILE_USER_PDF), $(DOXYFILE_USER_HTML))
	($(DOXYFILE_DEVEL_PDF), $(DOXYFILE_DEVEL_HTML)):
	Remove targets.
	($(DOXYFILE_USER), $(DOXYFILE_DEVEL)):
	New targets.

	* doc/Doxyfile.in (STRIP_FROM_PATH, INPUT, IMAGE_PATH):
	Remove all paths from the build directory.
	(EXCLUDE): Add paths to generated documentation and generated unit
	tests.

	* doc/Makefile.am (DOXYFILE)
	(DOXYFILE_USER_PDF, DOXYFILE_USER_HTML)
	(DOXYFILE_DEVEL_PDF, DOXYFILE_DEVEL_HTML):
	New variables.
	(USER_REFMAN_LATEX)
	(DEVEL_REFMAN_PDF, DEVEL_REFMAN_LATEX, DEVEL_REFMAN_HTML):
	New variables.
	(all-local): Depend on $(srcdir)/$(USER_REFMAN_PDF),
	$(srcdir)/user-refman-html.stamp.
	($(srcdir)/$(USER_REFMAN_PDF)): Split these targets and move the
	generation of the LaTeX sources...
	($(srcdir)/user-refman-latex.stamp)
	($(srcdir)/$(USER_REFMAN_LATEX))
	($(srcdir)/devel-refman-latex.stamp)
	($(srcdir)/$(DEVEL_REFMAN_LATEX)):
	...here (new targets).
	($(srcdir)/$(USER_REFMAN_HTML))
	($(srcdir)/$(DEVEL_REFMAN_HTML)):
	Delegate the actions to...
	($(srcdir)/user-refman-html.stamp)
	($(srcdir)/devel-refman-html.stamp):
	...these (new) targets.
	(clean-user-refman-latex, clean-user-refman-html)
	(clean-devel-refman-latex, clean-devel-refman-html):
	New (phony) targets.
	(maintainer-clean-local): Depend on clean-user-refman-latex,
	clean-user-refman-html, clean-devel-refman-latex and
	clean-devel-refman-html.
	(EXTRA_DIST): Disable Doxyfile_devel_html, Doxyfile_devel_pdf,
	Doxyfile_user_html and Doxyfile_user_pdf.
	Add $(DOXYFILE).in.
	($(srcdir)/Doxyfile_user, $(srcdir)/Doxyfile_user_pdf)
	($(srcdir)/Doxyfile_devel, $(srcdir)/Doxyfile_devel_pdf):
	Rename targets as...
	($(DOXYFILE_USER_HTML), $(DOXYFILE_USER_PDF))
	($(DOXYFILE_DEVEL_HTML), $(DOXYFILE_DEVEL_PDF)):
	...these.

	* doc/Makefile.am: Include
	$(top_srcdir)/milena/doc/examples/make.mk.
	(SUBDIRS): Remove variable.
	(examples, data-regen, fig-convert): Remove (phony) targets.
	* doc/examples/Makefile.am: Rename as...
	* doc/examples/make.mk: ...this.
	Adjust.
	* doc/examples/ima-save.cc,
	* doc/tools/sample_utils.hh:
	Adjust as well.
	* milena/doc/examples/split/ima-save-1.cc.raw: Regen.