- Olena-patches

Re: [Olena-patches] [Olena] #11: Integrate and use oln.m4 from Olena 0.11
by Olena 04 Feb '09

04 Feb '09

#11: Integrate and use oln.m4 from Olena 0.11 ------------------------+--------------------------------------------------- Reporter: levill_r | Owner: levill_r Type: defect | Status: closed Priority: minor | Milestone: Olena 1.1 Component: Olena | Version: 1.0 Resolution: duplicate | Keywords: oln.m4 configure.ac 0.10 ------------------------+--------------------------------------------------- Changes (by levill_r): * status: new => closed * resolution: => duplicate Comment: Merge with #129. -- Ticket URL: <https://trac.lrde.org/olena/ticket/11#comment:5> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 0

[PATCH 2/2] Move M4 files into m4/.
by Roland Levillain 04 Feb '09

04 Feb '09

* Makefile.am (ACLOCAL_AMFLAGS): s/build-aux/m4/. * configure.ac: Add AC_CONFIG_MACRO_DIR([m4]). * m4/: New directory. * build-aux/cfitsio.m4, * build-aux/freeimageplus.m4, * build-aux/pypath.m4, * build-aux/swig.m4, * build-aux/trimesh.m4, * build-aux/with-swilena.m4: Move files... * m4/cfitsio.m4, * m4/freeimageplus.m4, * m4/pypath.m4, * m4/swig.m4, * m4/trimesh.m4, * m4/with-swilena.m4: ...here. * m4/.gitignore: New. * build-aux/.gitignore: Adjust. --- ChangeLog | 24 ++++++++++++++++++++++++ Makefile.am | 2 +- build-aux/.gitignore | 5 ----- configure.ac | 3 +++ m4/.gitignore | 5 +++++ {build-aux => m4}/cfitsio.m4 | 0 {build-aux => m4}/freeimageplus.m4 | 0 {build-aux => m4}/pypath.m4 | 0 {build-aux => m4}/swig.m4 | 0 {build-aux => m4}/trimesh.m4 | 0 {build-aux => m4}/with-swilena.m4 | 0 11 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 m4/.gitignore rename {build-aux => m4}/cfitsio.m4 (100%) rename {build-aux => m4}/freeimageplus.m4 (100%) rename {build-aux => m4}/pypath.m4 (100%) rename {build-aux => m4}/swig.m4 (100%) rename {build-aux => m4}/trimesh.m4 (100%) rename {build-aux => m4}/with-swilena.m4 (100%) diff --git a/ChangeLog b/ChangeLog index 4fa9ea5..90a0af3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2009-02-04 Roland Levillain <roland(a)lrde.epita.fr> + + Move M4 files into m4/. + + * Makefile.am (ACLOCAL_AMFLAGS): s/build-aux/m4/. + * configure.ac: Add AC_CONFIG_MACRO_DIR([m4]). + * m4/: New directory. + * build-aux/cfitsio.m4, + * build-aux/freeimageplus.m4, + * build-aux/pypath.m4, + * build-aux/swig.m4, + * build-aux/trimesh.m4, + * build-aux/with-swilena.m4: + Move files... + * m4/cfitsio.m4, + * m4/freeimageplus.m4, + * m4/pypath.m4, + * m4/swig.m4, + * m4/trimesh.m4, + * m4/with-swilena.m4: + ...here. + * m4/.gitignore: New. + * build-aux/.gitignore: Adjust. + 2009-02-04 Frederic Bour <bour(a)lrde.epita.fr> [sandbox][bour] Backup of accuprops.cc. diff --git a/Makefile.am b/Makefile.am index 175def0..814551a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file through Automake to produce Makefile.in -*- Makefile -*- -ACLOCAL_AMFLAGS = -I build-aux +ACLOCAL_AMFLAGS = -I m4 SUBDIRS = build-aux external milena diff --git a/build-aux/.gitignore b/build-aux/.gitignore index 72875a8..d96c228 100644 --- a/build-aux/.gitignore +++ b/build-aux/.gitignore @@ -5,13 +5,8 @@ /*.elc /elisp-comp /install-sh -/libtool.m4 /*.log /ltmain.sh -/ltoptions.m4 -/ltsugar.m4 -/ltversion.m4 -/lt~obsolete.m4 /*Makefile /*Makefile?in /mdate-sh diff --git a/configure.ac b/configure.ac index b9bfb63..260baaa 100644 --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,9 @@ AC_PREREQ([2.61]) AC_INIT([Olena], [1.0], [olena(a)lrde.epita.fr] [olena]) +# M4 macros. +AC_CONFIG_MACRO_DIR([m4]) + # Auxiliary files. AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_FILES([build-aux/Makefile]) diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 0000000..94e6f26 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,5 @@ +/libtool.m4 +/ltoptions.m4 +/ltsugar.m4 +/ltversion.m4 +/lt~obsolete.m4 diff --git a/build-aux/cfitsio.m4 b/m4/cfitsio.m4 similarity index 100% rename from build-aux/cfitsio.m4 rename to m4/cfitsio.m4 diff --git a/build-aux/freeimageplus.m4 b/m4/freeimageplus.m4 similarity index 100% rename from build-aux/freeimageplus.m4 rename to m4/freeimageplus.m4 diff --git a/build-aux/pypath.m4 b/m4/pypath.m4 similarity index 100% rename from build-aux/pypath.m4 rename to m4/pypath.m4 diff --git a/build-aux/swig.m4 b/m4/swig.m4 similarity index 100% rename from build-aux/swig.m4 rename to m4/swig.m4 diff --git a/build-aux/trimesh.m4 b/m4/trimesh.m4 similarity index 100% rename from build-aux/trimesh.m4 rename to m4/trimesh.m4 diff --git a/build-aux/with-swilena.m4 b/m4/with-swilena.m4 similarity index 100% rename from build-aux/with-swilena.m4 rename to m4/with-swilena.m4 -- 1.6.1.2

1 0

[PATCH 1/2] Fix the generation of milena/headers.mk.
by Roland Levillain 04 Feb '09

04 Feb '09

* Makefile.am ($(srcdir)/headers.mk): Fix path to headers.mk in action. --- milena/ChangeLog | 7 +++++++ milena/Makefile.am | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a9106b9..2818ee1 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,10 @@ +2009-02-04 Roland Levillain <roland(a)lrde.epita.fr> + + Fix the generation of milena/headers.mk. + + * Makefile.am ($(srcdir)/headers.mk): Fix path to headers.mk in + action. + 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> * generate_dist_headers.sh (last_line): Fix shebang. diff --git a/milena/Makefile.am b/milena/Makefile.am index 75e9261..593fbf9 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -22,7 +22,7 @@ regen-dist: $(srcdir)/headers.mk # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # $(srcdir)/headers.mk: $(srcdir)/generate_dist_headers.sh - cd $(srcdir) && ./generate_dist_headers.sh && chmod -w $@ + cd $(srcdir) && ./generate_dist_headers.sh && chmod -w headers.mk include $(srcdir)/headers.mk -- 1.6.1.2

1 0

[PATCH 19/19] milena/generate_dist_headers.sh (last_line): Fix shebang.
by Roland Levillain 03 Feb '09

03 Feb '09

--- milena/ChangeLog | 4 ++++ milena/generate_dist_headers.sh | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index c369ab9..a9106b9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + * generate_dist_headers.sh (last_line): Fix shebang. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Have I/O-related code compile again. * mln/io/all.hh: Remove spurious inclusion of mln/io/raw/all.hh. diff --git a/milena/generate_dist_headers.sh b/milena/generate_dist_headers.sh index 7b9fb6a..68d4e30 100755 --- a/milena/generate_dist_headers.sh +++ b/milena/generate_dist_headers.sh @@ -1,5 +1,5 @@ -#/bin/sh -# +#! /bin/sh + # Generate milena/headers.mk # ------------------------------ # List all the headers in order to make them part of distribution. @@ -16,4 +16,3 @@ last_line=`tail -n 1 headers.mk | sed -e 's/\\\//g'` # remove '\' in last line sed '$d' < headers.mk > headers.mk.tmp # remove last line mv headers.mk.tmp headers.mk echo $last_line >> headers.mk # put the cleaned last line back. - -- 1.6.1.2

1 0

[PATCH 18/19] Typo: s/splitted/split/.
by Roland Levillain 03 Feb '09

03 Feb '09

* milena/doc/Doxyfile.in, * milena/doc/doc.mk, * milena/doc/tutorial/tools/split_sample.sh, * milena/doc/tutorial/tutorial.tex: Here. --- ChangeLog | 9 +++++++++ milena/doc/Doxyfile.in | 2 +- milena/doc/doc.mk | 4 +--- milena/doc/tutorial/tools/split_sample.sh | 11 +++++------ milena/doc/tutorial/tutorial.tex | 4 ++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index e749aad..faac3f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Typo: s/splitted/split/. + + * milena/doc/Doxyfile.in, + * milena/doc/doc.mk, + * milena/doc/tutorial/tools/split_sample.sh, + * milena/doc/tutorial/tutorial.tex: Here. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Use modern idioms of Libtool. * configure.ac: Invoke LT_INIT instead of AC_PROG_LIBTOOL. diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in index cda47dc..448bc3d 100644 --- a/milena/doc/Doxyfile.in +++ b/milena/doc/Doxyfile.in @@ -92,7 +92,7 @@ EXCLUDE_SYMBOLS = EXAMPLE_PATH = @top_srcdir@/milena/doc/tutorial/samples \ @top_builddir@/milena/doc/tutorial/samples \ @top_builddir@/milena/doc/tutorial/outputs \ - @top_builddir@/milena/doc/tutorial/outputs/splitted \ + @top_builddir@/milena/doc/tutorial/outputs/split \ @top_srcdir@/milena/doc/tutorial/outputs EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO diff --git a/milena/doc/doc.mk b/milena/doc/doc.mk index c5ff517..50aaefc 100644 --- a/milena/doc/doc.mk +++ b/milena/doc/doc.mk @@ -11,8 +11,6 @@ SAMPLES_SRCDIR = $(TUTORIAL_SRCDIR)/samples TUTORIAL_BUILDDIR = $(top_builddir)/milena/doc/tutorial OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs -SPLITTED_OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs/splitted +SPLIT_OUTPUTS_BUILDDIR = $(TUTORIAL_BUILDDIR)/outputs/split FIGURES_BUILDDIR = $(TUTORIAL_BUILDDIR)/figures SAMPLES_BUILDDIR = $(TUTORIAL_BUILDDIR)/samples - - diff --git a/milena/doc/tutorial/tools/split_sample.sh b/milena/doc/tutorial/tools/split_sample.sh index a3bf2d1..1a4d434 100755 --- a/milena/doc/tutorial/tools/split_sample.sh +++ b/milena/doc/tutorial/tools/split_sample.sh @@ -1,4 +1,4 @@ -#/bin/sh +# /bin/sh if ! [ $# -eq 3 ]; then echo "Usage: $0 <file1> <file extension> <dst dir>" @@ -8,16 +8,15 @@ fi begins=`grep -n -R '//[[:space:]]*\\\{' $1 | cut -d ':' -f 1` ends=`grep -n -R '//[[:space:]]*\\\}' $1 | cut -d ':' -f 1` -splitted=false +split=false i=1 for begin in $begins; do partend=$((`echo $ends | cut -d ' ' -f $i` - 1)) head -n $partend $1 | tail -n $(($partend - $begin)) > $3/"`basename $1 .$2`-$i.$2" i=$((i+1)) - splitted=true + split=true done -if [ $splitted ] && [ $i -gt 1 ]; then - echo "* $1 has been splitted in $i files." +if [ $split ] && [ $i -gt 1 ]; then + echo "* $1 has been split in $i files." fi - diff --git a/milena/doc/tutorial/tutorial.tex b/milena/doc/tutorial/tutorial.tex index 83219ee..6dd2d0c 100644 --- a/milena/doc/tutorial/tutorial.tex +++ b/milena/doc/tutorial/tutorial.tex @@ -93,7 +93,7 @@ \backslash htmlonly % } -% Include file '#1' from a splitted output. +% Include file '#1' from a split output. % #1 - part number (Optional) % #2 - file name \newcommand{\doxymoutput}[2][1]{ @@ -153,7 +153,7 @@ $$ \renewcommand{\doxycode}[2][1]{\lstinputlisting[frame=single]{samples/#2-#1.cc}} \renewcommand{\doxyrawcode}[1]{\lstinputlisting[frame=single]{samples/#1.cc.raw}} \renewcommand{\doxyoutput}[1]{\lstinputlisting[frame=single]{outputs/#1.txt}} -\renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/splitted/#2-#1.txt}} +\renewcommand{\doxymoutput}[2][1]{\lstinputlisting[frame=single]{outputs/split/#2-#1.txt}} \renewcommand{\doxyfigure}[3][1]{% \pgfimage[width=#3]{figures/#2-#1}% \label{#1}% -- 1.6.1.2

1 0

[PATCH 17/19] Use modern idioms of Libtool.
by Roland Levillain 03 Feb '09

03 Feb '09

* configure.ac: Invoke LT_INIT instead of AC_PROG_LIBTOOL. --- ChangeLog | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index c10b735..e749aad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Use modern idioms of Libtool. + + * configure.ac: Invoke LT_INIT instead of AC_PROG_LIBTOOL. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Complete the list of configured Makefiles. * configure.ac: Configure milena/tests/fun/p2p/Makefile. diff --git a/configure.ac b/configure.ac index 8bbeca4..b9bfb63 100644 --- a/configure.ac +++ b/configure.ac @@ -100,7 +100,7 @@ fi ## ------------------ ## # Use Libtool. -AC_PROG_LIBTOOL +LT_INIT # Check for Darwin. AC_CANONICAL_HOST -- 1.6.1.2

1 0

[PATCH 16/19] Complete the list of configured Makefiles.
by Roland Levillain 03 Feb '09

03 Feb '09

* configure.ac: Configure milena/tests/fun/p2p/Makefile. --- ChangeLog | 6 ++++++ configure.ac | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 631e6f3..c10b735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Complete the list of configured Makefiles. + + * configure.ac: Configure milena/tests/fun/p2p/Makefile. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Have I/O-related code compile again (cont.). * configure.ac: Configure milena/tests/io/dump/Makefile. diff --git a/configure.ac b/configure.ac index e3a2d7d..8bbeca4 100644 --- a/configure.ac +++ b/configure.ac @@ -205,6 +205,7 @@ AC_CONFIG_FILES([ milena/tests/fun/Makefile milena/tests/fun/i2v/Makefile milena/tests/fun/p2b/Makefile + milena/tests/fun/p2p/Makefile milena/tests/fun/p2v/Makefile milena/tests/fun/v2v/Makefile milena/tests/fun/vv2v/Makefile -- 1.6.1.2

1 0

[PATCH 15/19] Have I/O-related code compile again (cont.).
by Roland Levillain 03 Feb '09

03 Feb '09

* configure.ac: Configure milena/tests/io/dump/Makefile. Remove spurious configuration of milena/tests/io/raw/Makefile. --- ChangeLog | 7 +++++++ configure.ac | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 644e624..631e6f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Have I/O-related code compile again (cont.). + + * configure.ac: Configure milena/tests/io/dump/Makefile. + Remove spurious configuration of milena/tests/io/raw/Makefile. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Improve bootstrap's portability and usability. * bootstrap (run): `set -e' in the subshell. diff --git a/configure.ac b/configure.ac index c0d162c..e3a2d7d 100644 --- a/configure.ac +++ b/configure.ac @@ -212,6 +212,7 @@ AC_CONFIG_FILES([ milena/tests/geom/Makefile milena/tests/histo/Makefile milena/tests/io/Makefile + milena/tests/io/dump/Makefile milena/tests/io/fits/Makefile milena/tests/io/off/Makefile milena/tests/io/pbm/Makefile @@ -219,7 +220,6 @@ AC_CONFIG_FILES([ milena/tests/io/pgm/Makefile milena/tests/io/pnm/Makefile milena/tests/io/ppm/Makefile - milena/tests/io/raw/Makefile milena/tests/labeling/Makefile milena/tests/level/Makefile milena/tests/level/approx/Makefile -- 1.6.1.2

1 0

[PATCH 14/19] Have I/O-related code compile again.
by Roland Levillain 03 Feb '09

03 Feb '09

* mln/io/all.hh: Remove spurious inclusion of mln/io/raw/all.hh. * tests/io/Makefile.am (SUBDIRS): Add dump. Remove raw. --- milena/ChangeLog | 8 ++++++++ milena/mln/io/all.hh | 1 - milena/tests/io/Makefile.am | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index ab47d33..c369ab9 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Have I/O-related code compile again. + + * mln/io/all.hh: Remove spurious inclusion of mln/io/raw/all.hh. + * tests/io/Makefile.am (SUBDIRS): Add dump. + Remove raw. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Improve the portability of the generation of the tutorial. * doc/tutorial/Makefile.am (regen-dist): New (phony) target. diff --git a/milena/mln/io/all.hh b/milena/mln/io/all.hh index da9ddb8..4ccbcb2 100644 --- a/milena/mln/io/all.hh +++ b/milena/mln/io/all.hh @@ -53,7 +53,6 @@ namespace mln # include <mln/io/pgm/all.hh> # include <mln/io/pnm/all.hh> # include <mln/io/ppm/all.hh> -# include <mln/io/raw/all.hh> # include <mln/io/txt/all.hh> //# include <mln/io/fits/all.hh> //# include <mln/io/off/all.hh> diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am index 8895b09..78986bd 100644 --- a/milena/tests/io/Makefile.am +++ b/milena/tests/io/Makefile.am @@ -3,11 +3,11 @@ include $(top_srcdir)/milena/tests/tests.mk SUBDIRS = \ + dump \ fits \ off \ pbm \ pfm \ pgm \ pnm \ - ppm \ - raw + ppm -- 1.6.1.2

1 0

[PATCH 13/19] Improve the portability of the generation of the tutorial.
by Roland Levillain 03 Feb '09

03 Feb '09

* doc/tutorial/Makefile.am (regen-dist): New (phony) target. Depend on $(srcdir)/headers.stamp. ($(srcdir)/examples/examples.mk) ($(srcdir)/figures/figures.mk) ($(srcdir)/outputs/outputs.mk) ($(srcdir)/samples/samples.mk): New targets. Depend on $(srcdir)/headers.stamp. (EXTRA_DIST): Add $(srcdir)/headers.stamp. ($(srcdir)/headers.stamp): New target. Simplify included file names. * doc/tutorial/headers.stamp: New. * doc/tutorial/generate_dist_files.sh (ECHO_N): New. Set to printf. Use it instead of `echo -n'. * doc/tutorial/examples/examples.mk, * doc/tutorial/figures/figures.mk, * doc/tutorial/outputs/outputs.mk, * doc/tutorial/samples/samples.mk: Regen. --- milena/ChangeLog | 24 ++++++++ milena/doc/tutorial/Makefile.am | 22 ++++++-- milena/doc/tutorial/examples/examples.mk | 41 +++++++------- milena/doc/tutorial/figures/figures.mk | 48 ++++++++-------- milena/doc/tutorial/generate_dist_files.sh | 17 +++++-- milena/doc/tutorial/outputs/outputs.mk | 78 +++++++++++++------------- milena/doc/tutorial/samples/samples.mk | 81 ++++++++++++++-------------- 7 files changed, 180 insertions(+), 131 deletions(-) create mode 100644 milena/doc/tutorial/headers.stamp diff --git a/milena/ChangeLog b/milena/ChangeLog index 9d3951f..ab47d33 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,29 @@ 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + Improve the portability of the generation of the tutorial. + + * doc/tutorial/Makefile.am (regen-dist): New (phony) target. + Depend on $(srcdir)/headers.stamp. + ($(srcdir)/examples/examples.mk) + ($(srcdir)/figures/figures.mk) + ($(srcdir)/outputs/outputs.mk) + ($(srcdir)/samples/samples.mk): + New targets. + Depend on $(srcdir)/headers.stamp. + (EXTRA_DIST): Add $(srcdir)/headers.stamp. + ($(srcdir)/headers.stamp): New target. + Simplify included file names. + * doc/tutorial/headers.stamp: New. + * doc/tutorial/generate_dist_files.sh (ECHO_N): New. + Set to printf. Use it instead of `echo -n'. + * doc/tutorial/examples/examples.mk, + * doc/tutorial/figures/figures.mk, + * doc/tutorial/outputs/outputs.mk, + * doc/tutorial/samples/samples.mk: + Regen. + +2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> + * headers.mk: Regen. 2009-02-03 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/doc/tutorial/Makefile.am b/milena/doc/tutorial/Makefile.am index 88be83d..ceb4534 100644 --- a/milena/doc/tutorial/Makefile.am +++ b/milena/doc/tutorial/Makefile.am @@ -40,11 +40,25 @@ EXTRA_DIST = \ tutorial.tex \ tutorial.pdf +.PHONY: regen-dist +regen-dist: $(srcdir)/headers.stamp -include $(top_srcdir)/milena/doc/tutorial/examples/examples.mk -include $(top_srcdir)/milena/doc/tutorial/figures/figures.mk -include $(top_srcdir)/milena/doc/tutorial/outputs/outputs.mk -include $(top_srcdir)/milena/doc/tutorial/samples/samples.mk +$(srcdir)/examples/examples.mk: $(srcdir)/headers.stamp +$(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp +$(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp +$(srcdir)/samples/samples.mk: $(srcdir)/headers.stamp + +EXTRA_DIST += $(srcdir)/headers.stamp +$(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh + @rm -f $@.tmp + @touch $@.tmp + cd $(srcdir) && ./generate_dist_files.sh + @mv -f $@.tmp $@ + +include $(srcdir)/examples/examples.mk +include $(srcdir)/figures/figures.mk +include $(srcdir)/outputs/outputs.mk +include $(srcdir)/samples/samples.mk EXTRA_DIST += \ tools/sample_utils.hh \ diff --git a/milena/doc/tutorial/examples/examples.mk b/milena/doc/tutorial/examples/examples.mk index 7458ead..b6704dc 100644 --- a/milena/doc/tutorial/examples/examples.mk +++ b/milena/doc/tutorial/examples/examples.mk @@ -1,28 +1,29 @@ -## Generated by ../generate_dist_files, do not modify ## +## Generated by ../generate_dist_files, do not modify. + EXTRA_DIST += \ +examples/accu.cc \ +examples/box.cc \ examples/cpp_issue.cc \ -examples/sub_image.cc \ -examples/sub_image_if.cc \ -examples/p_vaccess.cc \ -examples/win_multiple.cc \ -examples/image2d.cc \ -examples/image_plain.cc \ -examples/p_run.cc \ -examples/proxy.cc \ -examples/p_array.2.cc \ examples/examples.mk \ examples/for_Z.cc \ +examples/image2d.cc \ +examples/image_flat.cc \ examples/image_if.cc \ +examples/image_plain.cc \ +examples/image_safe.cc \ +examples/p_array.2.cc \ +examples/p_array.cc \ +examples/p_image.cc \ +examples/p_key.2.cc \ examples/p_key.cc \ +examples/p_line2d.cc \ examples/p_mutable_array_of.cc \ examples/p_queue.cc \ -examples/image_flat.cc \ -examples/p_image.cc \ -examples/box.cc \ -examples/p_line2d.cc \ -examples/p_array.cc \ -examples/accu.cc \ -examples/p_key.2.cc \ -examples/window.cc \ -examples/image_safe.cc \ -examples/vec.cc +examples/p_run.cc \ +examples/p_vaccess.cc \ +examples/proxy.cc \ +examples/sub_image.cc \ +examples/sub_image_if.cc \ +examples/vec.cc \ +examples/win_multiple.cc \ +examples/window.cc diff --git a/milena/doc/tutorial/figures/figures.mk b/milena/doc/tutorial/figures/figures.mk index aba2682..39793cc 100644 --- a/milena/doc/tutorial/figures/figures.mk +++ b/milena/doc/tutorial/figures/figures.mk @@ -1,32 +1,32 @@ -## Generated by ../generate_dist_files, do not modify ## +## Generated by ../generate_dist_files, do not modify. + EXTRA_DIST += \ -figures/ima2d-rot-2.ppm \ -figures/tuto3_rw_image-1.ppm \ -figures/logical-not-2.pbm \ +figures/figures.mk \ +figures/fill-subdomain-1.pbm \ figures/fill-subdomain-2.ppm \ -figures/tuto4_genericity_and_algorithms-9.pgm \ -figures/labeling-compute-2.ppm \ -figures/tuto4_genericity_and_algorithms-7.pgm \ -figures/tuto4_genericity_and_algorithms-5.ppm \ -figures/ima2d-rot-1.ppm \ figures/fill-subdomain-3.ppm \ -figures/tuto4_genericity_and_algorithms-9.ppm \ -figures/logical-not-1.pbm \ -figures/ima_save.pbm \ -figures/figures.mk \ -figures/fill-subimage-cfun-1.ppm \ figures/fill-subdomain-4.ppm \ -figures/tuto4_genericity_and_algorithms-7.ppm \ -figures/tuto4_genericity_and_algorithms-6.ppm \ -figures/logical-not-3.pbm \ -figures/tuto4_genericity_and_algorithms-3.pbm \ -figures/tuto1_first_image-1.pbm \ -figures/tuto4_genericity_and_algorithms-1.ppm \ -figures/tuto4_genericity_and_algorithms-8.ppm \ +figures/fill-subimage-cfun-1.ppm \ +figures/ima2d-rot-1.ppm \ +figures/ima2d-rot-2.ppm \ +figures/ima_save.pbm \ figures/labeling-compute-1.pbm \ +figures/labeling-compute-2.ppm \ +figures/logical-not-1.pbm \ +figures/logical-not-2.pbm \ +figures/logical-not-3.pbm \ +figures/tuto3_rw_image-1.ppm \ +figures/tuto3_rw_image-2.ppm \ figures/tuto3_rw_image-3.ppm \ +figures/tuto4_genericity_and_algorithms-1.ppm \ +figures/tuto4_genericity_and_algorithms-2.ppm \ +figures/tuto4_genericity_and_algorithms-3.pbm \ figures/tuto4_genericity_and_algorithms-4.ppm \ +figures/tuto4_genericity_and_algorithms-5.ppm \ +figures/tuto4_genericity_and_algorithms-6.ppm \ +figures/tuto4_genericity_and_algorithms-7.pgm \ +figures/tuto4_genericity_and_algorithms-7.ppm \ figures/tuto4_genericity_and_algorithms-8.pgm \ -figures/tuto4_genericity_and_algorithms-2.ppm \ -figures/fill-subdomain-1.pbm \ -figures/tuto3_rw_image-2.ppm +figures/tuto4_genericity_and_algorithms-8.ppm \ +figures/tuto4_genericity_and_algorithms-9.pgm \ +figures/tuto4_genericity_and_algorithms-9.ppm diff --git a/milena/doc/tutorial/generate_dist_files.sh b/milena/doc/tutorial/generate_dist_files.sh index 91f75f1..2df4c22 100755 --- a/milena/doc/tutorial/generate_dist_files.sh +++ b/milena/doc/tutorial/generate_dist_files.sh @@ -1,12 +1,21 @@ -#!/bin/sh +#! /bin/sh + +## FIXME: Don't use `echo -n', as echo's options are not portable. +## +## http://www.gnu.org/software/autoconf/manual/html_node/Limitations-of-Builti… +## +## As an ugly workaround, use `printf' instead. The right approach +## would be to only emit lines ended with newlines. +ECHO_N=printf for dir in samples figures outputs examples; do OUT="$dir/$dir.mk" - echo "## Generated by ../generate_dist_files, do not modify ##" > $OUT - echo -n "EXTRA_DIST += " >> $OUT + echo "## Generated by ../generate_dist_files, do not modify." > $OUT + echo >>$OUT + $ECHO_N "EXTRA_DIST += " >> $OUT for file in `find $dir -mindepth 1`; do echo " \\" >> $OUT - echo -n $file >> $OUT + $ECHO_N $file >> $OUT done echo "" >> $OUT done diff --git a/milena/doc/tutorial/headers.stamp b/milena/doc/tutorial/headers.stamp new file mode 100644 index 0000000..e69de29 diff --git a/milena/doc/tutorial/outputs/outputs.mk b/milena/doc/tutorial/outputs/outputs.mk index c6d318a..cc0a31d 100644 --- a/milena/doc/tutorial/outputs/outputs.mk +++ b/milena/doc/tutorial/outputs/outputs.mk @@ -1,54 +1,54 @@ -## Generated by ../generate_dist_files, do not modify ## +## Generated by ../generate_dist_files, do not modify. + EXTRA_DIST += \ -outputs/win-create-1-display.txt \ -outputs/win-create-2.txt \ outputs/accu-right-instanciation.txt \ -outputs/ima2d-1.txt \ outputs/borderthickness.txt \ -outputs/ima-save.txt \ -outputs/fill-subimage-cfun.txt \ -outputs/labeling-compute.txt \ -outputs/parray-display-1.txt \ -outputs/fill-subdomain-shorter.txt \ +outputs/box2d-bbox.txt \ +outputs/domain-display.txt \ outputs/dpoint-1.txt \ +outputs/estim-sites.txt \ +outputs/extension-ignore.txt \ +outputs/fill-call-1.txt \ +outputs/fill-part-image.txt \ +outputs/fill-subdomain-shorter.txt \ +outputs/fill-subdomain.txt \ +outputs/fill-subimage-cfun.txt \ +outputs/fill.txt \ outputs/forall-piter.txt \ -outputs/predicate-1.txt \ -outputs/box2d-bbox.txt \ +outputs/fun-p2v-1.txt \ +outputs/graph-data.txt \ outputs/graph-iter.txt \ outputs/graph-output-1.txt \ -outputs/fill-call-1.txt \ -outputs/ima2d-rot.txt \ -outputs/paste-call-1.txt \ -outputs/fun-p2v-1.txt \ -outputs/estim-sites.txt \ -outputs/parray-append.txt \ -outputs/fill-subdomain.txt \ +outputs/ima-has.txt \ +outputs/ima-save.txt \ outputs/ima-size.txt \ -outputs/tuto2_first_image.txt \ -outputs/logical-not.txt \ -outputs/ima2d-display-output-2.txt \ -outputs/ima2d-decl-2.txt \ -outputs/paste.txt \ -outputs/outputs.mk \ +outputs/ima2d-1.txt \ +outputs/ima2d-2.txt \ +outputs/ima2d-3.txt \ +outputs/ima2d-4.txt \ +outputs/ima2d-5.txt \ outputs/ima2d-6-clone.txt \ outputs/ima2d-7.txt \ -outputs/tuto3_rw_image.txt \ -outputs/parray-bbox.txt \ -outputs/domain-display.txt \ +outputs/ima2d-decl-2.txt \ outputs/ima2d-display-1.txt \ -outputs/win-create-1.txt \ outputs/ima2d-display-2.txt \ outputs/ima2d-display-output-1.txt \ -outputs/fill-part-image.txt \ -outputs/tuto4_genericity_and_algorithms.txt \ -outputs/ima-has.txt \ -outputs/ima2d-5.txt \ -outputs/ima2d-4.txt \ +outputs/ima2d-display-output-2.txt \ +outputs/ima2d-rot.txt \ +outputs/labeling-compute.txt \ +outputs/logical-not.txt \ outputs/mln_var.txt \ -outputs/fill.txt \ +outputs/outputs.mk \ +outputs/parray-append.txt \ +outputs/parray-bbox.txt \ +outputs/parray-display-1.txt \ +outputs/paste-call-1.txt \ +outputs/paste.txt \ outputs/point-1.txt \ -outputs/extension-ignore.txt \ -outputs/graph-data.txt \ -outputs/tuto1_first_image.txt \ -outputs/ima2d-2.txt \ -outputs/ima2d-3.txt +outputs/predicate-1.txt \ +outputs/tuto2_first_image.txt \ +outputs/tuto3_rw_image.txt \ +outputs/tuto4_genericity_and_algorithms.txt \ +outputs/win-create-1-display.txt \ +outputs/win-create-1.txt \ +outputs/win-create-2.txt diff --git a/milena/doc/tutorial/samples/samples.mk b/milena/doc/tutorial/samples/samples.mk index 40b410d..ad479aa 100644 --- a/milena/doc/tutorial/samples/samples.mk +++ b/milena/doc/tutorial/samples/samples.mk @@ -1,53 +1,54 @@ -## Generated by ../generate_dist_files, do not modify ## +## Generated by ../generate_dist_files, do not modify. + EXTRA_DIST += \ -samples/paste-call-1.cc \ +samples/accu-right-instanciation.cc \ +samples/accu-wrong-instanciation.cc.raw \ +samples/borderthickness.cc \ +samples/box2d-bbox.cc \ +samples/domain-display.cc \ samples/dpoint-1.cc \ -samples/parray-append.cc \ +samples/estim-sites.cc \ +samples/extension-ignore.cc \ +samples/fill-call-1.cc \ +samples/fill-part-image.cc \ samples/fill-proto.cc.raw \ -samples/ima2d-restricted-1.cc.raw \ -samples/graph-iter.cc \ -samples/labeling-compute.cc \ -samples/ima2d-7.cc \ -samples/ima2d-restricted-2.cc.raw \ +samples/fill-subdomain-shorter.cc \ +samples/fill-subdomain.cc \ samples/fill-subimage-cfun.cc \ -samples/ima-save.cc \ -samples/point-1.cc \ -samples/box2d-bbox.cc \ +samples/fill.cc \ samples/forall-piter.cc \ -samples/ima-size.cc \ -samples/borderthickness.cc \ -samples/Makefile.in \ -samples/ima-load.cc \ +samples/fun-p2v-1.cc \ +samples/graph-data.cc \ +samples/graph-iter.cc \ samples/ima-has.cc \ -samples/win-create-1.cc \ -samples/samples.mk \ -samples/accu-wrong-instanciation.cc.raw \ -samples/accu-right-instanciation.cc \ -samples/ima2d-5.cc \ -samples/fill-subdomain.cc \ -samples/fill-subdomain-shorter.cc \ -samples/tuto3_rw_image.cc \ +samples/ima-load.cc \ +samples/ima-save.cc \ +samples/ima-size.cc \ +samples/ima2d-1.cc \ samples/ima2d-2.cc \ -samples/extension-ignore.cc \ -samples/Makefile.am \ -samples/parray-bbox.cc \ -samples/graph-data.cc \ -samples/mln_var.cc \ -samples/ima2d-4.cc \ -samples/predicate-1.cc \ samples/ima2d-3.cc \ -samples/tuto2_first_image.cc \ -samples/ima2d-1.cc \ -samples/estim-sites.cc \ +samples/ima2d-4.cc \ +samples/ima2d-5.cc \ samples/ima2d-6-clone.cc \ +samples/ima2d-7.cc \ +samples/ima2d-restricted-1.cc.raw \ +samples/ima2d-restricted-2.cc.raw \ samples/ima2d-restricted-3.cc.raw \ -samples/logical-not.cc \ -samples/fun-p2v-1.cc \ samples/ima2d-rot.cc \ -samples/fill-part-image.cc \ -samples/domain-display.cc \ -samples/tuto4_genericity_and_algorithms.cc \ +samples/labeling-compute.cc \ +samples/logical-not.cc \ +samples/Makefile.am \ +samples/Makefile.in \ +samples/mln_var.cc \ +samples/parray-append.cc \ +samples/parray-bbox.cc \ +samples/paste-call-1.cc \ samples/paste.cc \ -samples/fill.cc \ -samples/fill-call-1.cc \ +samples/point-1.cc \ +samples/predicate-1.cc \ +samples/samples.mk \ +samples/tuto2_first_image.cc \ +samples/tuto3_rw_image.cc \ +samples/tuto4_genericity_and_algorithms.cc \ +samples/win-create-1.cc \ samples/win-create-2.cc -- 1.6.1.2

1 0