1. 31 Mar, 2010 40 commits
    • Roland Levillain's avatar
      Have ``make maintainer-clean'' remove generated figures in doc/. · 2152dd03
      Roland Levillain authored
      	* 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).
      2152dd03
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Generate the list of split outputs in the documentation. · ba6a3f88
      Roland Levillain authored
      	* 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.
      ba6a3f88
    • Roland Levillain's avatar
      Prepare doc source files for the automation of output splitting. · a4d6bc84
      Roland Levillain authored
      	* doc/examples/tuto3/println.cc,
      	* doc/examples/tuto4/site_set_create.cc:
      	Use doc::begin_output and doc::end_output instead of hand-made
      	delimiters.
      a4d6bc84
    • Roland Levillain's avatar
      Have split_sample.sh announce the right number of output files. · 8293184f
      Roland Levillain authored
      	* doc/tools/split_sample.sh: Here.
      8293184f
    • Roland Levillain's avatar
      Fix programs in doc/examples/. · 6b0e5460
      Roland Levillain authored
      	* doc/examples/ima-save.cc: Add a FIXME.
      	* doc/examples/ima-load.cc: Likewise.
      	Avoid hard-coded paths.
      	* doc/examples/tuto4/image.cc: Make it compile.
      	* doc/img/small.pbm: New symbolic link to img/small.pbm.
      	* doc/examples/split/ima-load-1.cc.raw: Regen.
      	* doc/examples/fill-imageif-cfun.cc,
      	* figures.mk,
      	* ppm-figures.mk:
      	s/fill-subimage-cfun/fill-imageif-cfun/.
      6b0e5460
    • Roland Levillain's avatar
      bootstrap: Be terser. · 7fe9e76d
      Roland Levillain authored
      7fe9e76d
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Update PNG-to-EPS conversion rule. · 3e079f7e
      Roland Levillain authored
      	* doc/Makefile.am (.png.eps): No longer try to build figures/ in
      	the build directory.
      3e079f7e
    • Roland Levillain's avatar
      Remove useless paths in texi2dvi invocations. · 82f86bd0
      Roland Levillain authored
      	* doc/Makefile.am (TEXI2DVI_FLAGS):
      	Remove -I $(DOC_SRCDIR)/white_paper.
      82f86bd0
    • Roland Levillain's avatar
      Update cleaning rules in doc/. · 55cb496c
      Roland Levillain authored
      	* doc/Makefile.am (maintainer-clean-local):
      	Remove outdated actions.
      55cb496c
    • Roland Levillain's avatar
      Add missing dependencies. · 378fc00c
      Roland Levillain authored
      	* doc/Makefile.am (DOC_PACKAGES): Strip useless $(srcdir) prefixes.
      	(technical_dependencies)
      	(tutorial_dependencies)
      	(ref_guide_dependencies):
      	Add $(DOC_PACKAGES).
      378fc00c
    • Roland Levillain's avatar
      Ship non generated outputs. · 8a2626d8
      Roland Levillain authored
      	* doc/Makefile.am (EXTRA_DIST): Add $(MORE_OUTPUTS).
      8a2626d8
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Generate the list of outputs in the documentation. · 8aae86da
      Roland Levillain authored
      	* 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.
      8aae86da
    • Roland Levillain's avatar
      Handle dependencies of generated figures. · a8e00b1c
      Roland Levillain authored
      	* doc/figures.mk: New Make helper.
      	Include it...
      	* doc/Makefile.am: ...here.
      a8e00b1c
    • Roland Levillain's avatar
      doc/examples-outputs.mk: Regen. · e89fc512
      Roland Levillain authored
      e89fc512
    • Roland Levillain's avatar
      Prepare for the generation of multiple outputs from doc/ programs. · 365cdb48
      Roland Levillain authored
      	* doc/gen-examples-outputs-mk: Split generated rules in two so
      	that they produce a timestamp that outputs (and soon generated
      	figures) depend on.
      365cdb48
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Generate doc/examples-outputs.mk using sources in lieu of programs. · 3b9b30f4
      Roland Levillain authored
      	* 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.
      3b9b30f4
    • Roland Levillain's avatar
      Move bits about programs out of doc/Makefile.am to improve readability. · c16f0939
      Roland Levillain authored
      	* 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.
      c16f0939
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Generate the list of split examples in the documentation. · d76722cb
      Roland Levillain authored
      	* 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.
      d76722cb
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Generate the list of examples in the documentation. · e126d4cc
      Roland Levillain authored
      	* 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.
      e126d4cc
    • Roland Levillain's avatar
      Catch up with milena/doc generators. · 4e0645dc
      Roland Levillain authored
      	* bootstrap: Here.
      4e0645dc
    • Roland Levillain's avatar
      Revamp the conversion of images in the documentation. · 63aa7224
      Roland Levillain authored
      	* 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.
      63aa7224
    • Roland Levillain's avatar
      Add a rule to forcefully regen doc/examples-outputs.mk. · 42899043
      Roland Levillain authored
      	* doc/Makefile.am (regen-examples-outputs-mk): New (phony) target.
      	(regen-am): Invoke regen-examples-outputs-mk.
      42899043
    • Roland Levillain's avatar
      Ship doc/gen-examples-outputs-mk. · a1b9977e
      Roland Levillain authored
      	* doc/Makefile.am (EXTRA_DIST): Add gen-examples-outputs-mk.
      a1b9977e
    • Roland Levillain's avatar
      Fix the regeneration of HTML outputs. · 15b0083c
      Roland Levillain authored
      	* doc/Makefile.am
      	($(TECHNICAL_HTML_OUTPUTS))
      	($(TUTORIAL_HTML_OUTPUTS))
      	($(WHITE_PAPER_HTML_OUTPUTS))
      	($(REF_GUIDE_HTML_OUTPUTS)):
      	Fix tests on targets.
      15b0083c
    • Roland Levillain's avatar
      Distribute and clean documentation timestamps. · 71903ba6
      Roland Levillain authored
      	* 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.
      71903ba6
    • Roland Levillain's avatar
      Improve doc/'s cleaning rules. · fb074a93
      Roland Levillain authored
      	* 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).
      fb074a93
    • Roland Levillain's avatar
      Prevent todoxygen.sh from generating incomplete outputs. · f9e6be6b
      Roland Levillain authored
      	* 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.
      f9e6be6b
    • Roland Levillain's avatar
      Adjust todoxygen.sh to TeX4ht outputs. · ab842943
      Roland Levillain authored
      	* doc/tools/todoxygen.sh: Here.
      ab842943
    • Roland Levillain's avatar
      Disable the implicit generation of HTML from LaTeX. · 6e6e5b7d
      Roland Levillain authored
      	* 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.
      6e6e5b7d
    • Roland Levillain's avatar
      Adapt HTML generation to TeX4ht. · 2038fc7a
      Roland Levillain authored
      	* 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).
      2038fc7a
    • Roland Levillain's avatar
      Have texi2dvi use TeX4ht instead of HeVeA to produce HTML outputs. · c8e9fa84
      Roland Levillain authored
      	* build-aux/tex.mk (TEXI2HTML): Add --tex4ht.
      	* bootstrap (tempdir): Check for TeX4HT, dvipng and convert (from
      	ImageMagick).
      c8e9fa84
    • Roland Levillain's avatar
      Use texi2dvi to produce HTML from LaTeX. · a4af7921
      Roland Levillain authored
      	* 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.
      a4af7921
    • Roland Levillain's avatar
      Support HTML outputs in tex.mk. · 5440f594
      Roland Levillain authored
      	* build-aux/tex.mk (SUFFIXES): Add .html.
      	(.tex.html): New rule.
      	(TEXI2HTML, TEXI2HTML_FLAGS): New variables.
      5440f594
    • Roland Levillain's avatar
      Automake configuration. · 03ae101e
      Roland Levillain authored
      	* configure.ac: Remove option `foreign'.
      	Pass option `subdir-objects'.
      03ae101e