1. 31 Mar, 2010 37 commits
    • 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
    • Roland Levillain's avatar
      Have bootstrap check for HeVeA 1.10. · 512f054e
      Roland Levillain authored
      	* bootstrap (require): Take a flag as an optional second argument.
      	Use it to check for HeVeA 1.10.
      512f054e
    • Roland Levillain's avatar
      Split LaTeX-to-HTML rules to clear things up. · 0f9327c9
      Roland Levillain authored
      	* 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.
      0f9327c9
    • Roland Levillain's avatar
      List non generated documentation outputs separately. · f5190eac
      Roland Levillain authored
      	* 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.
      f5190eac
    • Roland Levillain's avatar
      Use texi2dvi to produce PDF from LaTeX. · 38d31738
      Roland Levillain authored
      	* 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.
      38d31738
    • Roland Levillain's avatar
      Add texi2dvi as well as a Make helper to use it. · d9fedc37
      Roland Levillain authored
      	* 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.
      d9fedc37
    • Roland Levillain's avatar
      Merge doc/ Makefile helpers into doc/Makefile.am. · 42bc78f8
      Roland Levillain authored
      	* 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.
      42bc78f8
    • Roland Levillain's avatar
      Improve dependencies of some documentation products. · f94a9b43
      Roland Levillain authored
      	* 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.
      f94a9b43
    • Roland Levillain's avatar
      Revamp the Makefile machinery in milena/doc/examples/. · 40ff7438
      Roland Levillain authored
      	* 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).
      40ff7438
    • Roland Levillain's avatar
      2e0e1ee3
    • Roland Levillain's avatar
      Have documentation's examples not depend on hard-coded paths. · 2d20a625
      Roland Levillain authored
      	* 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.
      2d20a625
    • Roland Levillain's avatar
      Update the documentation's copyright header. · 01ee98f5
      Roland Levillain authored
      	* mln/core/concept/object.hh: Here.
      01ee98f5
    • Roland Levillain's avatar
      Have Doxygen generate its outputs in the build directory. · d510e3e5
      Roland Levillain authored
      	* 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.
      d510e3e5
    • Roland Levillain's avatar
      Require Doxygen 1.5.6 at bootstrapping time. · 92124b54
      Roland Levillain authored
      	* bootstrap: Here.
      	(require): Be more tolerant w.r.t. version messages.
      92124b54
    • Roland Levillain's avatar
      3e348609
    • Roland Levillain's avatar
      Reorganize doc/Makefile.am. · 873492a2
      Roland Levillain authored
      	* doc/Makefile.am (edit, $(DOXYFILE_USER)):
      	Move these definitions closer to their use site.
      	(edit_devel, $(DOXYFILE_DEVEL)): Likewise.
      873492a2
    • Roland Levillain's avatar
      Have Doxyfile.in generate the user documentation. · 0f1307f3
      Roland Levillain authored
      	* 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.
      0f1307f3
    • Roland Levillain's avatar
      Generate the HTML and LaTeX Doxygen documentation in a single pass. · 2e5cd095
      Roland Levillain authored
      	* 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.
      2e5cd095
    • Roland Levillain's avatar
      Shorten the list of files visited by Doxygen. · 6bfa9af7
      Roland Levillain authored
      	* 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.
      6bfa9af7
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Clean up Doxygen-related Make rules in milena/doc/. · 76860ade
      Roland Levillain authored
      	* 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.
      76860ade
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Stop make from recurring in doc/examples. · e0ecffb4
      Roland Levillain authored
      	* 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.
      e0ecffb4
    • Roland Levillain's avatar
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Stop make from recurring in doc/white_paper. · 2aade699
      Roland Levillain authored
      	* doc/white_paper/Makefile.am: Rename as...
      	* doc/white_paper/white_paper.mk: ...this.
      	Adjust.
      	* doc/Makefile.am: Include $(srcdir)/white_paper/white_paper.mk.
      	(SUBDIRS): Remove white_paper.
      	(white-paper-pdf, white-paper-html): Remove (phony) targets.
      2aade699
    • Roland Levillain's avatar
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Stop make from recurring in doc/technical. · 50d2dc67
      Roland Levillain authored
      	* doc/technical/Makefile.am: Rename as...
      	* doc/technical/technical.mk: ...this.
      	Adjust.
      	* doc/Makefile.am: Include $(srcdir)/technical/technical.mk.
      	(SUBDIRS): Remove technical.
      50d2dc67
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Stop make from recurring in doc/tutorial. · c98d4ae0
      Roland Levillain authored
      	* doc/tutorial/Makefile.am: Rename as...
      	* doc/tutorial/tutorial.mk: ...this.
      	Adjust.
      	* doc/Makefile.am: Include $(srcdir)/tutorial/tutorial.mk.
      	(SUBDIRS): Remove tutorial.
      	($(srcdir)/tutorial/tutorial.hh): Remove target.
      	(tutorial-pdf, tutorial-html): Remove (phony) targets.
      c98d4ae0
    • Roland Levillain's avatar
    • Roland Levillain's avatar
      Stop make from recurring in doc/ref_guide. · 9ae11a0c
      Roland Levillain authored
      	* doc/ref_guide/Makefile.am: Rename as...
      	* doc/ref_guide/ref_guide.mk: ...this.
      	Adjust.
      	* doc/doc.mk (doc_dir): New variable.
      	* doc/Makefile.am: Include doc/ref_guide/ref_guide.mk.
      	(SUBDIRS): Remove ref_guide.
      	($(srcdir)/ref_guide/ref_guide.hh): Remove target.
      	(ref-guide-pdf, ref-guide-html): Remove (phony) targets.
      9ae11a0c
    • Roland Levillain's avatar
      Stop pruning Makefiles under milena/doc/. · f382e4a2
      Roland Levillain authored
      	* Makefile.am (LRDE_STRIPPED_DIST_FILES): Remove
      	$(distdir)/milena/doc/Makefile.am,
      	$(distdir)/milena/doc/ref_guide/Makefile.am,
      	$(distdir)/milena/doc/tutorial/Makefile.am and
      	$(distdir)/milena/doc/white_paper/Makefile.am.
      f382e4a2
    • Roland Levillain's avatar
      Get rid of Make targets `fake-doc' and `void-doc'. · 808c4e8b
      Roland Levillain authored
      	* doc/Makefile.am,
      	* doc/ref_guide/Makefile.am,
      	* doc/technical/Makefile.am,
      	* doc/tutorial/Makefile.am,
      	* doc/white_paper/Makefile.am
      	(fake-doc, void-doc): Remove targets.
      808c4e8b
    • Roland Levillain's avatar
      Have Scribo compile again. · a32de0fd
      Roland Levillain authored
      	* core/object_image.hh (object_image): Add prefix `mln::'.
      	* primitive/link/internal/anchors_3.hh: Include mln/util/array.hh.
      	Add missing `mln::' prefixes.
      	* src/binarization/sauvola_ms.cc:
      	s/influence_zone_geodesic/influence_zone_geodesic_saturated/.
      	* table/internal/connect_lines.hh: Likewise.
      	Remove a duplicated header inclusion.
      	* src/debug/Makefile.am
      	(bin_PROGRAMS, show_links_several_right_overlap_SOURCES): Disable
      	show_links_several_right_overlap.
      	* src/primitive/group/Makefile.am
      	(bin_PROGRAMS, group_from_rag_SOURCES): Disable group_from_rag.
      a32de0fd
  2. 23 Mar, 2010 1 commit
  3. 15 Mar, 2010 2 commits