* doc/Makefile.am (DATA_html_dirs_inst): New.
	Use it...
	(install-data-local, uninstall-local): Here.

	* doc/Makefile.am (all-local): Do not depend on
	$(srcdir)/$(USER_REFMAN_PDF).
	(dist_pdf_DATA): Add $(srcdir)/$(USER_REFMAN_PDF) instead of
	$(USER_REFMAN_PDF).
	(AM_CPPFLAGS): Remove -I$(top_srcdir)/milena/doc/tutorial/tools.
	(regen-doc, $(srcdir)/user-refman.stamp)
	(regen-devel-doc, $(srcdir)/devel-refman.stamp):
	Remove `-' before `rm' actions.
	(EXTRA_DIST): Add $(USER_REFMAN).
	(maintainer-clean-local)
	(install-data-local)
	(uninstall-local):
	Handle the new HTML subdirectories.
	(MAINTAINERCLEANFILES): Remove $(dist_html_DATA).

	* doc/tutorial/tutorial.tex,
	* doc/technical/technical.tex,
	* doc/ref_guide/ref_guide.tex,
	* doc/white_paper/white_paper.tex:
	Move...
	* doc/tutorial.tex,
	* doc/technical.tex,
	* doc/ref-guide.tex,
	* doc/white-paper.tex:
	...here.
	* doc/graphicx.hva: New.
	* doc/technical/figures/file_layout.pdf,
	* doc/technical/figures/file_layout.png,
	* doc/white_paper/figures/house.png,
	* doc/white_paper/figures/house_rag.png,
	* doc/white_paper/figures/house_wshed.png,
	* doc/white_paper/figures/house_wshed_mean_colors.png:
	Move...
	* doc/figures/technical/file_layout.pdf,
	* doc/figures/technical/file_layout.png,
	* doc/figures/house.png,
	* doc/figures/house_rag.png,
	* doc/figures/house_wshed.png,
	* doc/figures/house_wshed_mean_colors.png:
	...here.
	* doc/technical.tex: Adjust paths.
	* doc/technical/designs/,
	* doc/tutorial/designs/,
	* doc/tutorial/doxyfile_tuto.local,
	* doc/tutorial/image_types.txt,
	* doc/tutorial/image_values.txt,
	* doc/tutorial/images_tour.txt,
	* doc/tutorial/slides.tex:
	Rename as...
	* doc/technical.old/designs/,
	* doc/tutorial.old/design/,
	* doc/tutorial.old/doxyfile_tuto.local,
	* doc/tutorial.old/image_types.txt,
	* doc/tutorial.old/image_values.txt,
	* doc/tutorial.old/images_tour.txt,
	* doc/tutorial.old/slides.tex:
	...this.
	* tutorial/headers.stamp: Remove.
	* doc/Makefile.am (REFMAN_deps): Rename as...
	(refman_dependencies): ...this.
	Adjust paths.
	($(srcdir)/user-refman.stamp, $(srcdir)/devel-refman.stamp):
	Adjust.
	(PNGS, EPSS): Remove.
	(.png.eps): Remove rule.
	(TECHNICAL_FIGURES, WHITE_PAPER_FIGURES): New.
	(MORE_FIGURES): Add $(TECHNICAL_FIGURES) and
	$(WHITE_PAPER_FIGURES).
	(technical_dir, tutorial_dir, white_paper_dir, ref_guide_dir):
	Remove.
	(TECHNICAL, TUTORIAL, WHITE_PAPER, REF_GUIDE): New.
	(TECHNICAL_PDF, TUTORIAL_PDF, WHITE_PAPER_PDF, REF_GUIDE_PDF)
	(TUTORIAL_HH, REF_GUIDE_HH)
	(EXTRA_DIST, MAINTAINERCLEANFILES): Adjust.
	Remove (EPSS).
	(EXTRA_DIST): Remove $(PNGS).
	Add graphicx.hva.
	(technical_dependencies)
	(tutorial_dependencies)
	(ref_guide_dependencies):
	Rename as...
	(TECHNICAL_deps)
	(TUTORIAL_deps)
	(REF_GUIDE_deps):
	...this.
	(TECHNICAL_deps): Add $(TECHNICAL_FIGURES).
	(WHITE_PAPER_deps): New.
	($(TECHNICAL_PDF))
	($(TUTORIAL_PDF))
	($(WHITE_PAPER_PDF))
	($(REF_GUIDE_PDF)):
	Adjust.
	(TECHNICAL_HTML, TECHNICAL_HTML_OUTPUTS)
	(TUTORIAL_HTML, TUTORIAL_HTML_OUTPUTS)
	(WHITE_PAPER_HTML, WHITE_PAPER_HTML_OUTPUTS)
	(REF_GUIDE_HTML, REF_GUIDE_HTML_OUTPUTS):
	Remove.
	(all-local): Depend on
	$(srcdir)/$(TECHNICAL).stamp,
	$(srcdir)/$(TUTORIAL).stamp,
	$(srcdir)/$(WHITE_PAPER).stamp and
	$(srcdir)/$(REF_GUIDE).stamp.
	($(TECHNICAL_HTML).stamp)
	($(TUTORIAL_HTML).stamp)
	($(WHITE_PAPER_HTML).stamp)
	($(REF_GUIDE_HTML).stamp):
	Turn targets into...
	($(srcdir)/$(TECHNICAL).stamp)
	($(srcdir)/$(TUTORIAL).stamp)
	($(srcdir)/$(WHITE_PAPER).stamp)
	($(srcdir)/$(REF_GUIDE).stamp):
	...this.
	Adjust rules to generate outputs in a subdirectory.
	($(TECHNICAL_HTML_OUTPUTS))
	($(TUTORIAL_HTML_OUTPUTS))
	($(WHITE_PAPER_HTML_OUTPUTS))
	($(REF_GUIDE_HTML_OUTPUTS)):
	Turn targets into...
	($(srcdir)/$(TECHNICAL))
	($(srcdir)/$(TUTORIAL))
	($(srcdir)/$(WHITE_PAPER))
	($(srcdir)/$(REF_GUIDE)):
	...this.
	Adjust.
	($(TUTORIAL_HH)): Depend on $(srcdir)/$(TUTORIAL).stamp.
	Adjust rule.
	($(REF_GUIDE_HH)): Depend on (srcdir)/$(REF_GUIDE).stamp.
	Adjust rule.
	(dist_html_DATA): Remove.
	(DATA_html_dirs): New.
	(EXTRA_DIST): Add $(DATA_html_dirs).

	* doc/Makefile.am (TECHNICAL_HH): Remove variable.
	($(TECHNICAL_HH)): Remove rule.
	(MAINTAINERCLEANFILES): Remove $(TECHNICAL_HH).

	* doc/Makefile.am (regen-am): No longer invoke
	regen-pbm-figures-mk, regen-pgm-figures-mk nor
	regen-ppm-figures-mk.

	* doc/Makefile.am (EXTRA_DIST): Remove $(TECHNICAL_HH).
	* tests/transform/Makefile.am (check_PROGRAMS): Remove kht.
	(kht_SOURCES): Remove.

	* doc/Makefile.am (EXTRA_DIST): Remove
	$(srcdir)/devel-refman.stamp.

	* doc/Makefile.am (DEVEL_REFMAN_PDF):
	s/devel-refman-pdf/devel-refman.pdf/.

	* doc/Makefile.am (dist_doc_DATA): Remove variable.
	(dist_html_DATA, dist_pdf_DATA): New variables.
	(MAINTAINERCLEANFILES):
	Remove $(TECHNICAL_HTML_OUTPUTS), $(TECHNICAL_PDF),
	$(TUTORIAL_HTML_OUTPUTS), $(TUTORIAL_PDF),
	$(WHITE_PAPER_HTML_OUTPUTS), $(WHITE_PAPER_PDF),
	$(REF_GUIDE_HTML_OUTPUTS), $(REF_GUIDE_PDF) and
	$(USER_REFMAN_PDF).
	Add $(dist_html_DATA) and $(dist_pdf_DATA).

	* doc/Makefile.am:
	(DOC_SRCDIR, OUTPUTS_SRCDIR, SPLIT_OUTPUTS_SRCDIR, FIGURES_SRCDIR)
	(EXAMPLES_SRCDIR, SPLIT_EXAMPLES_SRCDIR, IMG_SRCDIR, doc_dir):
	Remove variables.
	Adjust.

	* doc/Makefile.am (doc, doc-user, doc-devel)
	(doc-pdf, doc-html, doc-devel-pdf, doc-devel-html)
	(ref-doc, ref-doc-pdf, ref-doc-devel, ref-doc-devel-pdf)
	(tutorial-pdf, white-paper-pdf, ref-guide-pdf)
	(tutorial-html, white-paper-html, ref-guide-html):
	Remove (phony) targets.
	* Makefile.am (doc, tutorial): Likewise.

	* doc/gen-figures-mk: Generate Make variables PBM_FIGURES,
	PGM_FIGURES and PPM_FIGURES in output.
	* doc/figures.mk: Regen.
	* doc/Makefile.am: No longer include $(srcdir)/pbm-figures.mk,
	$(srcdir)/pgm-figures.mk nor $(srcdir)/ppm-figures.mk.
	($(srcdir)/pbm-figures.mk, regen-pbm-figures-mk)
	($(srcdir)/pgm-figures.mk, regen-pgm-figures-mk)
	($(srcdir)/ppm-figures.mk, regen-ppm-figures-mk):
	Remove rules.
	(EXTRA_DIST): Add $(FIGURES).
	Remove $(PBM_FIGURES), $(PGM_FIGURES) and $(PPM_FIGURES).
	* doc/pbm-figures.mk,
	* doc/pgm-figures.mk,
	* doc/ppm-figures.mk:
	Remove.

	* doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk.
	Aesthetic changes.

	* doc/Makefile.am ($(srcdir)/figures.mk): New rule.
	(regen-figures-mk): New phony target.
	(regen-am): Invoke regen-figures-mk.
	* doc/figures.mk: Regen.

	* doc/gen-figures-mk: New script.
	* doc/Makefile.am (EXTRA_DIST): Add gen-figures-mk.

	* doc/examples/accu-right-instanciation.cc: Rename as...
	* doc/examples/accu-right-instantiation.cc: ...this.
	* doc/examples/accu-wrong-instanciation.cc.raw,
	* doc/examples/split/accu-right-instanciation-1.cc.raw,
	* doc/outputs/accu-right-instanciation.txt:
	Likewise, rename as...
	* doc/examples/accu-wrong-instantiation.cc.raw,
	* doc/examples/split/accu-right-instantiation-1.cc.raw,
	* doc/outputs/accu-right-instantiation.txt:
	...these.
	* doc/ref_guide/ref_guide.tex,
	* doc/programs-examples.mk,
	* doc/Makefile.am (MORE_EXAMPLES):
	s/instanciation/instantiation/.
	* doc/examples-outputs.mk,
	* doc/examples.mk,
	* doc/outputs.mk,
	* doc/split-examples.mk:
	Regen.

	* doc/Makefile.am (refman_dependencies):
	Remove $(SPLIT_EXAMPLES) and $(SPLIT_OUTPUTS).
	(technical_dependencies): Add $(TECHNICAL_EXAMPLES).
	(tutorial_dependencies, ref_guide_dependencies):
	Add $(EXAMPLES)	and $(OUTPUTS).

	* doc/Makefile.am (MORE_FIGURES): New variable.
	Add figures/accu_image_morpher_big_picture.pdf.
	(EXTRA_DIST): Add $(MORE_FIGURES).

	* doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES):
	New variables.
	(EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES).

	* doc/figures.mk
	(EXTEND_FIGURES)
	(FILL_FIGURES)
	(FILL_SUBDOMAIN_FIGURES)
	(FILL_IMAGEIF_CFUN_FIGURES)
	(IMA2D_ROT_FIGURES)
	(IMA_SAVE_FIGURES)
	(LABELING_COMPUTE_FIGURES)
	(LOGICAL_NOT_FIGURES)
	(TUTO2_FIRST_IMAGE_FIGURES)
	(TUTO3_COLORIZE_FIGURES)
	(TUTO3_RW_IMAGE_FIGURES)
	(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES):
	New variables.
	Use them to simplify rules.
	(FIGURES): New variable.
	* doc/Makefile.am (MAINTAINERCLEANFILES): Add $(FIGURES).

	* doc/Makefile.am ($(srcdir)/split-outputs.mk): New rule.
	(regen-split-outputs-mk): New (phony) target.
	($(srcdir)/split-outputs.stamp): Remove rule.
	(refman_dependencies)
	(tutorial_dependencies)
	(ref_guide_dependencies)
	(EXTRA_DIST, MAINTAINERCLEANFILES):
	Remove $(srcdir)/split-outputs.stamp
	Add $(SPLIT_OUTPUTS).
	(regen-am): Remake regen-split-outputs-mk.
	* doc/gen-split-outputs-mk: New script.
	Use it to generate...
	* doc/split-outputs.mk: ...this (new) Make helper.

	* doc/Makefile.am (.png.eps): No longer try to build figures/ in
	the build directory.

	* doc/Makefile.am (TEXI2DVI_FLAGS):
	Remove -I $(DOC_SRCDIR)/white_paper.

	* doc/Makefile.am (maintainer-clean-local):
	Remove outdated actions.

	* doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes.
	(technical_dependencies)
	(tutorial_dependencies)
	(ref_guide_dependencies):
	Add $(DOC_PACKAGES).

	* doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS).

	* doc/Makefile.am (OUTPUTS): Remove this variable that used to be
	populated by hand.
	Include $(srcdir)/outputs.mk.
	No longer include $(srcdir)/outputs/outputs.mk.
	$(srcdir)/outputs.mk: New target.
	(EXTRA_DIST): Add $(OUTPUTS).
	(regen-outputs-mk): New (phony) target.
	(regen-am): Remake regen-outputs-mk.
	Do not recreate $(srcdir)/headers.stamp.tmp.
	(EXTRA_DIST): Remove headers.stamp.
	($(srcdir)/outputs/outputs.mk)
	($(srcdir)/headers.stamp):
	Remove rules.
	(outputs/outputs.mk): Remove this Make helper.
	Supersed by...
	(outputs.mk): ...this (new) Make helper.

	* doc/figures.mk: New Make helper.
	Include it...
	* doc/Makefile.am: ...here.

	* doc/gen-examples-outputs-mk: Take sources as input instead of
	programs.
	* doc/examples-outputs.mk: Regen.
	* doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk):
	Adjust caller.
	Use `find' to get inputs instead of relying on
	$(PROGRAMS_examples).
	Rename target as...
	($(srcdir)/examples-outputs.mk): ...this.
	Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on
	$(srcdir)/Makefile.am.
	(regen-examples-outputs-mk): Adjust as well.
	* doc/programs-examples.mk: Adjust comments.

	* doc/Makefile.am (PROGRAMS_examples)
	(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)
	(tuto2_first_image_SOURCES)
	(tuto3_colorize_SOURCES)
	(tuto3_println_SOURCES)
	(tuto3_rw_image_SOURCES)
	(tuto3_trace_SOURCES)
	(tuto4_genericity_and_algorithms_SOURCES)
	(tuto4_point2d_SOURCES)
	(tuto4_site_set_create_SOURCES)
	(win_create_1_SOURCES)
	(win_create_2_SOURCES):
	Move variables...
	* doc/programs-examples.mk: ...here (new file).
	(PROGRAMS_examples): Rename first_routine as tuto3_first_routine.
	Add ima-load and tuto4_image.
	(first_routine_SOURCES): Remove this variable.
	Superseded by...
	(tuto3_first_routine_SOURCES): ...this (new) variable.
	(ima_load_SOURCES, tuto4_image_SOURCES): New variables.
	* doc/Makefile.am: Include $(srcdir)/programs-examples.mk.

	* doc/gen-split-examples-mk: New script.
	* doc/Makefile.am: Include ($(srcdir)/split-examples.mk).
	($(srcdir)/split-examples.mk): New target.
	(EXTRA_DIST, MAINTAINERCLEANFILES): Add $(SPLIT_EXAMPLES).
	(refman_dependencies)
	(tutorial_dependencies)
	(ref_guide_dependencies):
	Remove $(doc_dir)/split-examples.stamp.
	Add $(SPLIT_EXAMPLES).
	(regen-split-examples-mk): New (phony) target.
	(regen-am): Remake regen-split-examples-mk instead of using
	generate_dist_files.sh.
	($(srcdir)/headers.stamp): No longer call generate_dist_files.sh
	to regen doc/examples/examples.mk.
	No longer include $(srcdir)/examples/examples.mk.
	($(srcdir)/examples/examples.mk, $(srcdir)/split-examples.stamp):
	Remove rules.
	(EXTRA_DIST, MAINTAINERCLEANFILES):
	Remove $(srcdir)/split-examples.stamp.
	(EXTRA_DIST): Add gen-split-examples-mk.
	* doc/split-examples.mk: New (generated) Make helper.
	* doc/examples/examples.mk: Remove.

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

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