1. 31 Mar, 2010 40 commits
    • Roland Levillain's avatar
      Have doc/gen-figures-mk generate more Makefile bits. · 2199e6c6
      Roland Levillain authored
      	* 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.
      2199e6c6
    • Roland Levillain's avatar
      Rework doc/gen-figures-mk a bit. · 390b0955
      Roland Levillain authored
      	* doc/gen-figures-mk (gen_var): New function.
      	Use to factor the emission of the Make variable at the end of the
      	output.
      	Aesthetic changes.
      390b0955
    • Roland Levillain's avatar
      Add options to boostrap. · c94f5179
      Roland Levillain authored
      	* bootstrap: Here.
      	(usage): New function.  Call it when invoked with option
      	`-h, --help'.
      	Regen files stored in the repository only if invoked with option
      	`-r, --regen'.
      c94f5179
    • Roland Levillain's avatar
      Distribute doc/gen-split-outputs-mk. · e5e506be
      Roland Levillain authored
      	* doc/Makefile.am (EXTRA_DIST): Add gen-split-outputs-mk.
      	Aesthetic changes.
      e5e506be
    • Roland Levillain's avatar
      d637b996
    • Roland Levillain's avatar
      Make a more portable use of mktemp. · 084fcc94
      Roland Levillain authored
      	* doc/gen-split-examples-mk,
      	* doc/gen-split-outputs-mk:
      	Here.
      084fcc94
    • Roland Levillain's avatar
      Sort inputs of generators to make them deterministic w.r.t. outputs. · 67c299f4
      Roland Levillain authored
      	* doc/gen-split-examples-mk,
      	* doc/gen-split-outputs-mk:
      	Here.
      	* doc/split-examples.mk: Regen.
      67c299f4
    • Roland Levillain's avatar
      bootstrap: Regen milena/doc/figures.mk. · 9196858a
      Roland Levillain authored
      9196858a
    • Roland Levillain's avatar
      Generate the list of figures in the documentation. · c0e0ae6f
      Roland Levillain authored
      	* doc/Makefile.am ($(srcdir)/figures.mk): New rule.
      	(regen-figures-mk): New phony target.
      	(regen-am): Invoke regen-figures-mk.
      	* doc/figures.mk: Regen.
      c0e0ae6f
    • Roland Levillain's avatar
      Add a script to generate doc/figures.mk. · 642d87ac
      Roland Levillain authored
      	* doc/gen-figures-mk: New script.
      	* doc/Makefile.am (EXTRA_DIST): Add gen-figures-mk.
      642d87ac
    • Roland Levillain's avatar
      Use a more uniform style in doc/figures.mk. · 2c4e1e1d
      Roland Levillain authored
      	* doc/figures.mk: Here.
      	Reorder items.
      2c4e1e1d
    • Roland Levillain's avatar
      Prepare doc examples for the automated generation of figures.mk. · b599cccf
      Roland Levillain authored
      	* doc/examples/ima2d-rot.cc (main): Pass a literal string as
      	second argument to doc::ppmsave to help gen-figures-mk.
      	* doc/examples/labeling-compute.cc (main): Have calls to
      	doc::ppmsave fit on a single line to help gen-figures-mk.
      b599cccf
    • Roland Levillain's avatar
      bootstrap: Various fixes. · 4ee83123
      Roland Levillain authored
      4ee83123
    • Roland Levillain's avatar
      Typo in doc/. · 9b894672
      Roland Levillain authored
      	* 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.
      9b894672
    • Roland Levillain's avatar
      Fix dependencies in doc/. · 6c5106c0
      Roland Levillain authored
      	* 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).
      6c5106c0
    • Roland Levillain's avatar
      Distribute non generated figures in the documentation. · fca54282
      Roland Levillain authored
      	* doc/Makefile.am (MORE_FIGURES): New variable.
      	Add figures/accu_image_morpher_big_picture.pdf.
      	(EXTRA_DIST): Add $(MORE_FIGURES).
      fca54282
    • Roland Levillain's avatar
      Distribute non generated examples in the documentation. · 55f2622b
      Roland Levillain authored
      	* doc/Makefile.am (TECHNICAL_EXAMPLES, MORE_EXAMPLES):
      	New variables.
      	(EXTRA_DIST): Add $(TECHNICAL_EXAMPLES) and $(MORE_EXAMPLES).
      55f2622b
    • 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