March 2010 - Olena-patches

last-svn-commit-116-g5d5c643 Revert to HeVeA to generate HTML from LaTeX.
by Roland Levillain 30 Mar '10

30 Mar '10

* build-aux/tex.mk (TEXI2HTML): Disable flag `--tex4ht'. --- ChangeLog | 6 ++++++ build-aux/tex.mk | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4819920..0795216 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> + + Revert to HeVeA to generate HTML from LaTeX. + + * build-aux/tex.mk (TEXI2HTML): Disable flag `--tex4ht'. + 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> * Makefile.am (LOCAL_RECURSIVE_TARGETS): Remove doc. diff --git a/build-aux/tex.mk b/build-aux/tex.mk index d93110d..da35475 100644 --- a/build-aux/tex.mk +++ b/build-aux/tex.mk @@ -27,7 +27,11 @@ TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch TEXI2PDF = $(TEXI2DVI) --pdf TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS) -TEXI2HTML = $(TEXI2DVI) --html --tex4ht +# FIXME: Switch back to HeVeA, since we currently rely on its outputs +# to produce intermediate products later read by Doxygen. When these +# intermediate files are produced directly (from LaTeX sources), +# switch again to TeX4ht. +TEXI2HTML = $(TEXI2DVI) --html # --tex4ht TEXI2HTML_FLAGS = $(TEXI2DVI_FLAGS) SUFFIXES = .tex .pdf -- 1.5.6.5

1 0

last-svn-commit-109-gae36e6d Revert to HeVeA to generate HTML from LaTeX.
by Roland Levillain 30 Mar '10

30 Mar '10

* build-aux/tex.mk (TEXI2HTML): Disable flag `--tex4ht'. --- ChangeLog | 6 ++++++ build-aux/tex.mk | 6 +++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index d028cf1..299865a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-03-30 Roland Levillain <roland(a)lrde.epita.fr> + + Revert to HeVeA to generate HTML from LaTeX. + + * build-aux/tex.mk (TEXI2HTML): Disable flag `--tex4ht'. + 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> * Makefile.am (LOCAL_RECURSIVE_TARGETS): Remove doc. diff --git a/build-aux/tex.mk b/build-aux/tex.mk index d93110d..da35475 100644 --- a/build-aux/tex.mk +++ b/build-aux/tex.mk @@ -27,7 +27,11 @@ TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch TEXI2PDF = $(TEXI2DVI) --pdf TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS) -TEXI2HTML = $(TEXI2DVI) --html --tex4ht +# FIXME: Switch back to HeVeA, since we currently rely on its outputs +# to produce intermediate products later read by Doxygen. When these +# intermediate files are produced directly (from LaTeX sources), +# switch again to TeX4ht. +TEXI2HTML = $(TEXI2DVI) --html # --tex4ht TEXI2HTML_FLAGS = $(TEXI2DVI_FLAGS) SUFFIXES = .tex .pdf -- 1.5.6.5

1 0

last-svn-commit-115-gb59137a No longer generate doc/technical/technical.hh.
by Roland Levillain 26 Mar '10

26 Mar '10

* doc/Makefile.am (TECHNICAL_HH): Remove variable. ($(TECHNICAL_HH)): Remove rule. (MAINTAINERCLEANFILES): Remove $(TECHNICAL_HH). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 22 ---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b0124c2..6f8eec9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + No longer generate doc/technical/technical.hh. + + * doc/Makefile.am (TECHNICAL_HH): Remove variable. + ($(TECHNICAL_HH)): Remove rule. + (MAINTAINERCLEANFILES): Remove $(TECHNICAL_HH). + +2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + Fix the regeneration of files in doc/. * doc/Makefile.am (regen-am): No longer invoke diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index b952ab7..25116c1 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -352,27 +352,6 @@ $(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp dist_html_DATA = $(TECHNICAL_HTML_OUTPUTS) -## FIXME: technical technical.hh does not seem to be used (by the -## Doyxgen documentation); remove its generation? Careful, -## technical/technical.html *is* probably required, though. - -# Intermediate product for the various doc targets of the parent -# directory. -# -# This is not a bug: TECHNICAL_HH is meant to have a `.hh' -# extension, since it is later parsed by Doxygen, which complains -# about `.html' files. -TECHNICAL_HH = $(technical_dir)/technical.hh -$(TECHNICAL_HH): $(TECHNICAL_HTML) $(srcdir)/tools/todoxygen.sh -# The script `todoxygen.sh' may fail and still create a (partial and -# invalid) file, thus preventing Make from trying to generate it -# again. The solution is to use a temporary file as output and rename -# it if the script succeeds. - rm -f $@.tmp - $(srcdir)/tools/todoxygen.sh $< $@.tmp $(srcdir) - mv -f $@.tmp $@ - - # Final product. TECHNICAL_PDF = $(technical_dir)/technical.pdf # Extra dependencies. @@ -382,7 +361,6 @@ dist_pdf_DATA = $(TECHNICAL_PDF) EXTRA_DIST += $(technical_dir)/technical.tex -MAINTAINERCLEANFILES += $(TECHNICAL_HH) ## ---------- ## ## Tutorial. ## -- 1.5.6.5

1 0

last-svn-commit-108-g6936919 No longer generate doc/technical/technical.hh.
by Roland Levillain 26 Mar '10

26 Mar '10

* doc/Makefile.am (TECHNICAL_HH): Remove variable. ($(TECHNICAL_HH)): Remove rule. (MAINTAINERCLEANFILES): Remove $(TECHNICAL_HH). --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 22 ---------------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 135c07e..3d0cd69 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + No longer generate doc/technical/technical.hh. + + * doc/Makefile.am (TECHNICAL_HH): Remove variable. + ($(TECHNICAL_HH)): Remove rule. + (MAINTAINERCLEANFILES): Remove $(TECHNICAL_HH). + +2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + Fix the regeneration of files in doc/. * doc/Makefile.am (regen-am): No longer invoke diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index b952ab7..25116c1 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -352,27 +352,6 @@ $(TECHNICAL_HTML_OUTPUTS): $(TECHNICAL_HTML).stamp dist_html_DATA = $(TECHNICAL_HTML_OUTPUTS) -## FIXME: technical technical.hh does not seem to be used (by the -## Doyxgen documentation); remove its generation? Careful, -## technical/technical.html *is* probably required, though. - -# Intermediate product for the various doc targets of the parent -# directory. -# -# This is not a bug: TECHNICAL_HH is meant to have a `.hh' -# extension, since it is later parsed by Doxygen, which complains -# about `.html' files. -TECHNICAL_HH = $(technical_dir)/technical.hh -$(TECHNICAL_HH): $(TECHNICAL_HTML) $(srcdir)/tools/todoxygen.sh -# The script `todoxygen.sh' may fail and still create a (partial and -# invalid) file, thus preventing Make from trying to generate it -# again. The solution is to use a temporary file as output and rename -# it if the script succeeds. - rm -f $@.tmp - $(srcdir)/tools/todoxygen.sh $< $@.tmp $(srcdir) - mv -f $@.tmp $@ - - # Final product. TECHNICAL_PDF = $(technical_dir)/technical.pdf # Extra dependencies. @@ -382,7 +361,6 @@ dist_pdf_DATA = $(TECHNICAL_PDF) EXTRA_DIST += $(technical_dir)/technical.tex -MAINTAINERCLEANFILES += $(TECHNICAL_HH) ## ---------- ## ## Tutorial. ## -- 1.5.6.5

1 0

last-svn-commit-114-g15608e3 Fix the regeneration of files in doc/.
by Roland Levillain 26 Mar '10

26 Mar '10

* doc/Makefile.am (regen-am): No longer invoke regen-pbm-figures-mk, regen-pgm-figures-mk nor regen-ppm-figures-mk. --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7c54292..b0124c2 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of files in doc/. + + * doc/Makefile.am (regen-am): No longer invoke + regen-pbm-figures-mk, regen-pgm-figures-mk nor + regen-ppm-figures-mk. + 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> Fix the Milena distribution. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 7d23ab3..b952ab7 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -699,9 +699,6 @@ EXTRA_DIST += generate_dist_files.sh include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: $(MAKE) $(AM_MAKEFLAGS) regen-figures-mk - $(MAKE) $(AM_MAKEFLAGS) regen-pbm-figures-mk - $(MAKE) $(AM_MAKEFLAGS) regen-pgm-figures-mk - $(MAKE) $(AM_MAKEFLAGS) regen-ppm-figures-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-split-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-outputs-mk -- 1.5.6.5

1 0

last-svn-commit-107-ga905428 Fix the regeneration of files in doc/.
by Roland Levillain 26 Mar '10

26 Mar '10

* doc/Makefile.am (regen-am): No longer invoke regen-pbm-figures-mk, regen-pgm-figures-mk nor regen-ppm-figures-mk. --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 3 --- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index aa0a374..135c07e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2010-03-26 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the regeneration of files in doc/. + + * doc/Makefile.am (regen-am): No longer invoke + regen-pbm-figures-mk, regen-pgm-figures-mk nor + regen-ppm-figures-mk. + 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> Fix the Milena distribution. diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 7d23ab3..b952ab7 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -699,9 +699,6 @@ EXTRA_DIST += generate_dist_files.sh include $(top_srcdir)/build-aux/regen-recursive.mk regen-am: $(MAKE) $(AM_MAKEFLAGS) regen-figures-mk - $(MAKE) $(AM_MAKEFLAGS) regen-pbm-figures-mk - $(MAKE) $(AM_MAKEFLAGS) regen-pgm-figures-mk - $(MAKE) $(AM_MAKEFLAGS) regen-ppm-figures-mk $(MAKE) $(AM_MAKEFLAGS) regen-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-split-examples-mk $(MAKE) $(AM_MAKEFLAGS) regen-outputs-mk -- 1.5.6.5

1 0

last-svn-commit-113-gcb0b452 Fix the Milena distribution.
by Roland Levillain 23 Mar '10

23 Mar '10

* doc/Makefile.am (EXTRA_DIST): Remove $(TECHNICAL_HH). * tests/transform/Makefile.am (check_PROGRAMS): Remove kht. (kht_SOURCES): Remove. --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 4 +--- milena/tests/transform/Makefile.am | 2 -- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index af8cf7b..7c54292 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix the Milena distribution. + + * doc/Makefile.am (EXTRA_DIST): Remove $(TECHNICAL_HH). + * tests/transform/Makefile.am (check_PROGRAMS): Remove kht. + (kht_SOURCES): Remove. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Do not distribute the developer (Doxygen) reference manual. * doc/Makefile.am (EXTRA_DIST): Remove diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index c8a52c9..7d23ab3 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -380,9 +380,7 @@ $(TECHNICAL_PDF): $(technical_dependencies) dist_pdf_DATA = $(TECHNICAL_PDF) -EXTRA_DIST += \ - $(technical_dir)/technical.tex \ - $(TECHNICAL_HH) +EXTRA_DIST += $(technical_dir)/technical.tex MAINTAINERCLEANFILES += $(TECHNICAL_HH) diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index 07feb9b..2184188 100644 --- a/milena/tests/transform/Makefile.am +++ b/milena/tests/transform/Makefile.am @@ -25,7 +25,6 @@ check_PROGRAMS = \ distance_front \ distance_geodesic \ hough \ - kht \ influence_zone_front \ influence_zone_geodesic \ influence_zone_geodesic_saturated @@ -35,7 +34,6 @@ distance_and_closest_point_geodesic_SOURCES = distance_and_closest_point_geodesi distance_front_SOURCES = distance_front.cc distance_geodesic_SOURCES = distance_geodesic.cc hough_SOURCES = hough.cc -kht_SOURCES = kht.cc influence_zone_front_SOURCES = influence_zone_front.cc influence_zone_geodesic_SOURCES = influence_zone_geodesic.cc influence_zone_geodesic_saturated_SOURCES = influence_zone_geodesic_saturated.cc -- 1.5.6.5

1 0

last-svn-commit-106-gd6ecf0a Fix the Milena distribution.
by Roland Levillain 23 Mar '10

23 Mar '10

* doc/Makefile.am (EXTRA_DIST): Remove $(TECHNICAL_HH). * tests/transform/Makefile.am (check_PROGRAMS): Remove kht. (kht_SOURCES): Remove. --- milena/ChangeLog | 8 ++++++++ milena/doc/Makefile.am | 4 +--- milena/tests/transform/Makefile.am | 2 -- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 077edaf..aa0a374 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix the Milena distribution. + + * doc/Makefile.am (EXTRA_DIST): Remove $(TECHNICAL_HH). + * tests/transform/Makefile.am (check_PROGRAMS): Remove kht. + (kht_SOURCES): Remove. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Do not distribute the developer (Doxygen) reference manual. * doc/Makefile.am (EXTRA_DIST): Remove diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index c8a52c9..7d23ab3 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -380,9 +380,7 @@ $(TECHNICAL_PDF): $(technical_dependencies) dist_pdf_DATA = $(TECHNICAL_PDF) -EXTRA_DIST += \ - $(technical_dir)/technical.tex \ - $(TECHNICAL_HH) +EXTRA_DIST += $(technical_dir)/technical.tex MAINTAINERCLEANFILES += $(TECHNICAL_HH) diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am index 07feb9b..2184188 100644 --- a/milena/tests/transform/Makefile.am +++ b/milena/tests/transform/Makefile.am @@ -25,7 +25,6 @@ check_PROGRAMS = \ distance_front \ distance_geodesic \ hough \ - kht \ influence_zone_front \ influence_zone_geodesic \ influence_zone_geodesic_saturated @@ -35,7 +34,6 @@ distance_and_closest_point_geodesic_SOURCES = distance_and_closest_point_geodesi distance_front_SOURCES = distance_front.cc distance_geodesic_SOURCES = distance_geodesic.cc hough_SOURCES = hough.cc -kht_SOURCES = kht.cc influence_zone_front_SOURCES = influence_zone_front.cc influence_zone_geodesic_SOURCES = influence_zone_geodesic.cc influence_zone_geodesic_saturated_SOURCES = influence_zone_geodesic_saturated.cc -- 1.5.6.5

1 0

last-svn-commit-112-g4502bec Do not distribute the developer (Doxygen) reference manual.
by Roland Levillain 23 Mar '10

23 Mar '10

* doc/Makefile.am (EXTRA_DIST): Remove $(srcdir)/devel-refman.stamp. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 1 - 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 458ff31..af8cf7b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Do not distribute the developer (Doxygen) reference manual. + + * doc/Makefile.am (EXTRA_DIST): Remove + $(srcdir)/devel-refman.stamp. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix the name of the developer (Doxygen) PDF reference manual. * doc/Makefile.am (DEVEL_REFMAN_PDF): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index d40722d..c8a52c9 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -288,7 +288,6 @@ $(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/$(DEVEL_REFMAN) cd $(srcdir)/$(DEVEL_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf cp -f $(srcdir)/$(DEVEL_REFMAN)/latex/refman.pdf $@ -EXTRA_DIST += $(srcdir)/devel-refman.stamp MAINTAINERCLEANFILES += $(srcdir)/devel-refman.stamp $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(refman_dependencies) @rm -f $@.tmp -- 1.5.6.5

1 0

last-svn-commit-105-g5412e23 Do not distribute the developer (Doxygen) reference manual.
by Roland Levillain 23 Mar '10

23 Mar '10

* doc/Makefile.am (EXTRA_DIST): Remove $(srcdir)/devel-refman.stamp. --- milena/ChangeLog | 7 +++++++ milena/doc/Makefile.am | 1 - 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index cd2f756..077edaf 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Do not distribute the developer (Doxygen) reference manual. + + * doc/Makefile.am (EXTRA_DIST): Remove + $(srcdir)/devel-refman.stamp. + +2010-03-23 Roland Levillain <roland(a)lrde.epita.fr> + Fix the name of the developer (Doxygen) PDF reference manual. * doc/Makefile.am (DEVEL_REFMAN_PDF): diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index d40722d..c8a52c9 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -288,7 +288,6 @@ $(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/$(DEVEL_REFMAN) cd $(srcdir)/$(DEVEL_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf cp -f $(srcdir)/$(DEVEL_REFMAN)/latex/refman.pdf $@ -EXTRA_DIST += $(srcdir)/devel-refman.stamp MAINTAINERCLEANFILES += $(srcdir)/devel-refman.stamp $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(refman_dependencies) @rm -f $@.tmp -- 1.5.6.5

1 0