last-svn-commit-526-gbc407e2 Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++.
by Roland Levillain
* configure.ac: Here.
---
ChangeLog | 6 ++++++
configure.ac | 1 -
2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 263dfff..3155d63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Remove a superfluous invocation of AM_CONDITIONAL regarding Magick++.
+
+ * configure.ac: Here.
+
2010-10-22 Roland Levillain <roland(a)lrde.epita.fr>
Do not trigger an error when Qt is missing, too old or not working.
diff --git a/configure.ac b/configure.ac
index 63e26c0..1febf2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -210,7 +210,6 @@ OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio])
OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx],
[MAGICKXX], [], [ImageMagick++])
-AM_CONDITIONAL(HAVE_MAGICKXX, test "x$oln_have_magickxx" = xyes)
# ---- #
# Qt. #
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-537-gb325467 Add advice about the release process.
by Roland Levillain
* HACKING (Required Software): Add LaTeX2HTML.
Aesthetic changes.
(Useful Tools): Rename as...
(Useful Developer Tools): ...this.
(Releasing): New section.
---
ChangeLog | 10 ++++++
HACKING | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 95f6f93..01b7429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+ Add advice about the release process.
+
+ * HACKING (Required Software): Add LaTeX2HTML.
+ Aesthetic changes.
+ (Useful Tools): Rename as...
+ (Useful Developer Tools): ...this.
+ (Releasing): New section.
+
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
Have Milena be in charge of its own configuration and distribution.
* configure.ac: Remove parts now handled by Milena's configure.ac.
diff --git a/HACKING b/HACKING
index 24e2dac..f453ef0 100644
--- a/HACKING
+++ b/HACKING
@@ -38,7 +38,7 @@ repository::
By default, `bootstrap' does not regenerate files that are stored on
the repository. If you want to refresh them (e.g., because your
-working copy is in a bad state), you can ask boostrap to regenerate
+working copy is in a bad state), you can ask bootstrap to regenerate
them::
./bootstrap --regen
@@ -58,41 +58,103 @@ the following extra programs if you want to work on the Olena project.
* If you want to make changes anywhere within the project, you will
need:
- - GNU Autoconf 2.61
+ - GNU Autoconf 2.61,
- - GNU Automake 1.10
+ - GNU Automake 1.10,
- - GNU Libtool 1.5.22
+ - GNU Libtool 1.5.22.
* If you plan to make changes within Swilena, you must have:
- - SWIG 1.3.35
+ - SWIG 1.3.35,
- - Python 2.5
+ - Python 2.5.
* If you want to change and/or rebuild the documentation, the
following tools are required:
- - Doxygen 1.5.6
+ - Doxygen 1.5.6,
- - a fairly recent LaTeX distribution
+ - a fairly recent LaTeX distribution,
- - the `listings' LaTeX package
+ - the `listings' LaTeX package,
- - the `convert' utility from ImageMagick (6.3.7)
+ - the `convert' utility from ImageMagick (6.3.7),
- HeVeA 1.10
+ - LaTeX2HTML (or at minimum, its `html.sty' style file).
+
Note that `bootstrap' checks for the presence of most of these tools.
-------------
-Useful Tools
-------------
+----------------------
+Useful Developer Tools
+----------------------
+
+ * `rebox.el' is a useful companion to Emacs, creating boxes with
+ comment delimiters.
+
+
+---------
+Releasing
+---------
+
+Things to remember before releasing a new version of Olena, roughly in
+this order:
+
+ * Olena is designed to be released as a whole package
+ (`olena-x.y.tar.{gz,bz2}') *and* as seperate components
+ (`milena-x.y.tar.{gz,bz2}', `olena-scribo-x.y.tar.{gz,bz2}',
+ `swilena-x.y.tar.{gz,bz2}', etc.). Both procedures should be
+ checked.
+
+ * Update and sync `NEWS' and `README' files in the top-level and
+ subprojects directories (milena/, scribo/, etc.).
+
+ * Likewise, update all `AUTHORS' files. Hint: use
+ `git shortlog -s DIR' to get the list of all authors who have
+ contributed to the files under directory DIR.
+
+ * Update revision numbers in `configure.ac' in the top-level and
+ subprojects directories (`milena/', `scribo/', etc.).
+
+ * Create all packages using `make distcheck' (not just
+ `make dist').
+
+ * Install the packages in `/lrde/dload/olena/x.y/', along with the
+ Olena's `NEWS' and `README' files, and Milena's documentation (in
+ `/lrde/dload/olena/x.y./doc/') and ensure they are accessible
+ from the Web.
+
+ * Create a new page on the Olena Web site for the new release (e.g,
+ http://olena.lrde.epita.fr/OlenaXYZ for release x.y.z), update
+ the Download page (http://olena.lrde.epita.fr/Download) and make
+ an announcement on the main page (http://olena.lrde.epita.fr/).
+ Also update the link under the Download item of the left bar
+ (http://olena.lrde.epita.fr/WebContents).
+
+ * Likewise, announce the release on the Olena Trac
+ (https://trac.lrde.org/olena/).
+
+ * Make an announce on the LRDE Web site as well
+ (http://www.lrde.epita.fr/cgi-bin/twiki/view/Lrde/News).
+
+ * Finally, post an announce to annonce(a)lrde.epita.fr. See the files
+ `ANNOUNCE-x.y' at the root of the repository for models.
+
+ * Tag the commit COMMIT corresponding to the release in the
+ repository, and push it to the Git server.
+
+ git tag -m "Olena release x.y." olena-x.y COMMIT
+ git push tag olena-x.y
-`rebox.el' is a useful companion to Emacs, creating boxes with comment
-delimiters.
+ * After the release, do not forget to append an `a' to the release
+ number in `configure.ac's (e.g., turn `1.1' into `1.1a') to
+ prevent any mistake regarding version numbers in subsequent
+ releases. Create new (empty) sections in `NEWS' files
+ accordingly.
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-536-gae9a871 Add advice about the release process.
by Roland Levillain
* HACKING (Required Software): Add LaTeX2HTML.
Aesthetic changes.
(Useful Tools): Rename as...
(Useful Developer Tools): ...this.
(Releasing): New section.
---
ChangeLog | 10 ++++++
HACKING | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 95f6f93..01b7429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+ Add advice about the release process.
+
+ * HACKING (Required Software): Add LaTeX2HTML.
+ Aesthetic changes.
+ (Useful Tools): Rename as...
+ (Useful Developer Tools): ...this.
+ (Releasing): New section.
+
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
Have Milena be in charge of its own configuration and distribution.
* configure.ac: Remove parts now handled by Milena's configure.ac.
diff --git a/HACKING b/HACKING
index 24e2dac..f453ef0 100644
--- a/HACKING
+++ b/HACKING
@@ -38,7 +38,7 @@ repository::
By default, `bootstrap' does not regenerate files that are stored on
the repository. If you want to refresh them (e.g., because your
-working copy is in a bad state), you can ask boostrap to regenerate
+working copy is in a bad state), you can ask bootstrap to regenerate
them::
./bootstrap --regen
@@ -58,41 +58,103 @@ the following extra programs if you want to work on the Olena project.
* If you want to make changes anywhere within the project, you will
need:
- - GNU Autoconf 2.61
+ - GNU Autoconf 2.61,
- - GNU Automake 1.10
+ - GNU Automake 1.10,
- - GNU Libtool 1.5.22
+ - GNU Libtool 1.5.22.
* If you plan to make changes within Swilena, you must have:
- - SWIG 1.3.35
+ - SWIG 1.3.35,
- - Python 2.5
+ - Python 2.5.
* If you want to change and/or rebuild the documentation, the
following tools are required:
- - Doxygen 1.5.6
+ - Doxygen 1.5.6,
- - a fairly recent LaTeX distribution
+ - a fairly recent LaTeX distribution,
- - the `listings' LaTeX package
+ - the `listings' LaTeX package,
- - the `convert' utility from ImageMagick (6.3.7)
+ - the `convert' utility from ImageMagick (6.3.7),
- HeVeA 1.10
+ - LaTeX2HTML (or at minimum, its `html.sty' style file).
+
Note that `bootstrap' checks for the presence of most of these tools.
-------------
-Useful Tools
-------------
+----------------------
+Useful Developer Tools
+----------------------
+
+ * `rebox.el' is a useful companion to Emacs, creating boxes with
+ comment delimiters.
+
+
+---------
+Releasing
+---------
+
+Things to remember before releasing a new version of Olena, roughly in
+this order:
+
+ * Olena is designed to be released as a whole package
+ (`olena-x.y.tar.{gz,bz2}') *and* as seperate components
+ (`milena-x.y.tar.{gz,bz2}', `olena-scribo-x.y.tar.{gz,bz2}',
+ `swilena-x.y.tar.{gz,bz2}', etc.). Both procedures should be
+ checked.
+
+ * Update and sync `NEWS' and `README' files in the top-level and
+ subprojects directories (milena/, scribo/, etc.).
+
+ * Likewise, update all `AUTHORS' files. Hint: use
+ `git shortlog -s DIR' to get the list of all authors who have
+ contributed to the files under directory DIR.
+
+ * Update revision numbers in `configure.ac' in the top-level and
+ subprojects directories (`milena/', `scribo/', etc.).
+
+ * Create all packages using `make distcheck' (not just
+ `make dist').
+
+ * Install the packages in `/lrde/dload/olena/x.y/', along with the
+ Olena's `NEWS' and `README' files, and Milena's documentation (in
+ `/lrde/dload/olena/x.y./doc/') and ensure they are accessible
+ from the Web.
+
+ * Create a new page on the Olena Web site for the new release (e.g,
+ http://olena.lrde.epita.fr/OlenaXYZ for release x.y.z), update
+ the Download page (http://olena.lrde.epita.fr/Download) and make
+ an announcement on the main page (http://olena.lrde.epita.fr/).
+ Also update the link under the Download item of the left bar
+ (http://olena.lrde.epita.fr/WebContents).
+
+ * Likewise, announce the release on the Olena Trac
+ (https://trac.lrde.org/olena/).
+
+ * Make an announce on the LRDE Web site as well
+ (http://www.lrde.epita.fr/cgi-bin/twiki/view/Lrde/News).
+
+ * Finally, post an announce to annonce(a)lrde.epita.fr. See the files
+ `ANNOUNCE-x.y' at the root of the repository for models.
+
+ * Tag the commit COMMIT corresponding to the release in the
+ repository, and push it to the Git server.
+
+ git tag -m "Olena release x.y." olena-x.y COMMIT
+ git push tag olena-x.y
-`rebox.el' is a useful companion to Emacs, creating boxes with comment
-delimiters.
+ * After the release, do not forget to append an `a' to the release
+ number in `configure.ac's (e.g., turn `1.1' into `1.1a') to
+ prevent any mistake regarding version numbers in subsequent
+ releases. Create new (empty) sections in `NEWS' files
+ accordingly.
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-536-g86cd9e2 Add advice about the release process.
by Roland Levillain
* HACKING (Required Software): Add LaTeX2HTML.
Aesthetic changes.
(Useful Tools): Rename as...
(Useful Developer Tools): ...this.
(Releasing): New section.
---
ChangeLog | 10 ++++++
HACKING | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 95f6f93..01b7429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+ Add advice about the release process.
+
+ * HACKING (Required Software): Add LaTeX2HTML.
+ Aesthetic changes.
+ (Useful Tools): Rename as...
+ (Useful Developer Tools): ...this.
+ (Releasing): New section.
+
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
Have Milena be in charge of its own configuration and distribution.
* configure.ac: Remove parts now handled by Milena's configure.ac.
diff --git a/HACKING b/HACKING
index 24e2dac..f453ef0 100644
--- a/HACKING
+++ b/HACKING
@@ -38,7 +38,7 @@ repository::
By default, `bootstrap' does not regenerate files that are stored on
the repository. If you want to refresh them (e.g., because your
-working copy is in a bad state), you can ask boostrap to regenerate
+working copy is in a bad state), you can ask bootstrap to regenerate
them::
./bootstrap --regen
@@ -58,41 +58,103 @@ the following extra programs if you want to work on the Olena project.
* If you want to make changes anywhere within the project, you will
need:
- - GNU Autoconf 2.61
+ - GNU Autoconf 2.61,
- - GNU Automake 1.10
+ - GNU Automake 1.10,
- - GNU Libtool 1.5.22
+ - GNU Libtool 1.5.22.
* If you plan to make changes within Swilena, you must have:
- - SWIG 1.3.35
+ - SWIG 1.3.35,
- - Python 2.5
+ - Python 2.5.
* If you want to change and/or rebuild the documentation, the
following tools are required:
- - Doxygen 1.5.6
+ - Doxygen 1.5.6,
- - a fairly recent LaTeX distribution
+ - a fairly recent LaTeX distribution,
- - the `listings' LaTeX package
+ - the `listings' LaTeX package,
- - the `convert' utility from ImageMagick (6.3.7)
+ - the `convert' utility from ImageMagick (6.3.7),
- HeVeA 1.10
+ - LaTeX2HTML (or at minimum, its `html.sty' style file).
+
Note that `bootstrap' checks for the presence of most of these tools.
-------------
-Useful Tools
-------------
+----------------------
+Useful Developer Tools
+----------------------
+
+ * `rebox.el' is a useful companion to Emacs, creating boxes with
+ comment delimiters.
+
+
+---------
+Releasing
+---------
+
+Things to remember before releasing a new version of Olena, roughly in
+this order:
+
+ * Olena is designed to be released as a whole package
+ (`olena-x.y.tar.{gz,bz2}') *and* as seperate components
+ (`milena-x.y.tar.{gz,bz2}', `olena-scribo-x.y.tar.{gz,bz2}',
+ `swilena-x.y.tar.{gz,bz2}', etc.). Both procedures should be
+ checked.
+
+ * Update and sync `NEWS' and `README' files in the top-level and
+ subprojects directories (milena/, scribo/, etc.).
+
+ * Likewise, update all `AUTHORS' files. Hint: use
+ `git shortlog -s DIR' to get the list of all authors who have
+ contributed to the files under directory DIR.
+
+ * Update revision numbers in `configure.ac' in the top-level and
+ subprojects directories (`milena/', `scribo/', etc.).
+
+ * Create all packages using `make distcheck' (not just
+ `make dist').
+
+ * Install the packages in `/lrde/dload/olena/x.y/', along with the
+ Olena's `NEWS' and `README' files, and Milena's documentation (in
+ `/lrde/dload/olena/x.y./doc/') and ensure they are accessible
+ from the Web.
+
+ * Create a new page on the Olena Web site for the new release (e.g,
+ http://olena.lrde.epita.fr/OlenaXYZ for release x.y.z), update
+ the Download page (http://olena.lrde.epita.fr/Download) and make
+ an announcement on the main page (http://olena.lrde.epita.fr/).
+ Also update the link under the Download item of the left bar
+ (http://olena.lrde.epita.fr/WebContents).
+
+ * Likewise, announce the release on the Olena Trac
+ (https://trac.lrde.org/olena/).
+
+ * Make an announce on the LRDE Web site as well
+ (http://www.lrde.epita.fr/cgi-bin/twiki/view/Lrde/News).
+
+ * Finally, post an announce to annonce(a)lrde.epita.fr. See the files
+ `ANNOUNCE-x.y' at the root of the repository for models.
+
+ * Tag the commit COMMIT corresponding to the release in the
+ repository, and push it to the Git server.
+
+ git tag -m "Olena release x.y." olena-x.y COMMIT
+ git push tag olena-x.y
-`rebox.el' is a useful companion to Emacs, creating boxes with comment
-delimiters.
+ * After the release, do not forget to append an `a' to the release
+ number in `configure.ac's (e.g., turn `1.1' into `1.1a') to
+ prevent any mistake regarding version numbers in subsequent
+ releases. Create new (empty) sections in `NEWS' files
+ accordingly.
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-537-g6dffea1 Add advice about the release process.
by Roland Levillain
* HACKING (Required Software): Add LaTeX2HTML.
Aesthetic changes.
(Useful Tools): Rename as...
(Useful Developer Tools): ...this.
(Releasing): New section.
---
ChangeLog | 10 ++++++
HACKING | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++----------
2 files changed, 87 insertions(+), 15 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 95f6f93..01b7429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+ Add advice about the release process.
+
+ * HACKING (Required Software): Add LaTeX2HTML.
+ Aesthetic changes.
+ (Useful Tools): Rename as...
+ (Useful Developer Tools): ...this.
+ (Releasing): New section.
+
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
Have Milena be in charge of its own configuration and distribution.
* configure.ac: Remove parts now handled by Milena's configure.ac.
diff --git a/HACKING b/HACKING
index 24e2dac..f453ef0 100644
--- a/HACKING
+++ b/HACKING
@@ -38,7 +38,7 @@ repository::
By default, `bootstrap' does not regenerate files that are stored on
the repository. If you want to refresh them (e.g., because your
-working copy is in a bad state), you can ask boostrap to regenerate
+working copy is in a bad state), you can ask bootstrap to regenerate
them::
./bootstrap --regen
@@ -58,41 +58,103 @@ the following extra programs if you want to work on the Olena project.
* If you want to make changes anywhere within the project, you will
need:
- - GNU Autoconf 2.61
+ - GNU Autoconf 2.61,
- - GNU Automake 1.10
+ - GNU Automake 1.10,
- - GNU Libtool 1.5.22
+ - GNU Libtool 1.5.22.
* If you plan to make changes within Swilena, you must have:
- - SWIG 1.3.35
+ - SWIG 1.3.35,
- - Python 2.5
+ - Python 2.5.
* If you want to change and/or rebuild the documentation, the
following tools are required:
- - Doxygen 1.5.6
+ - Doxygen 1.5.6,
- - a fairly recent LaTeX distribution
+ - a fairly recent LaTeX distribution,
- - the `listings' LaTeX package
+ - the `listings' LaTeX package,
- - the `convert' utility from ImageMagick (6.3.7)
+ - the `convert' utility from ImageMagick (6.3.7),
- HeVeA 1.10
+ - LaTeX2HTML (or at minimum, its `html.sty' style file).
+
Note that `bootstrap' checks for the presence of most of these tools.
-------------
-Useful Tools
-------------
+----------------------
+Useful Developer Tools
+----------------------
+
+ * `rebox.el' is a useful companion to Emacs, creating boxes with
+ comment delimiters.
+
+
+---------
+Releasing
+---------
+
+Things to remember before releasing a new version of Olena, roughly in
+this order:
+
+ * Olena is designed to be released as a whole package
+ (`olena-x.y.tar.{gz,bz2}') *and* as seperate components
+ (`milena-x.y.tar.{gz,bz2}', `olena-scribo-x.y.tar.{gz,bz2}',
+ `swilena-x.y.tar.{gz,bz2}', etc.). Both procedures should be
+ checked.
+
+ * Update and sync `NEWS' and `README' files in the top-level and
+ subprojects directories (milena/, scribo/, etc.).
+
+ * Likewise, update all `AUTHORS' files. Hint: use
+ `git shortlog -s DIR' to get the list of all authors who have
+ contributed to the files under directory DIR.
+
+ * Update revision numbers in `configure.ac' in the top-level and
+ subprojects directories (`milena/', `scribo/', etc.).
+
+ * Create all packages using `make distcheck' (not just
+ `make dist').
+
+ * Install the packages in `/lrde/dload/olena/x.y/', along with the
+ Olena's `NEWS' and `README' files, and Milena's documentation (in
+ `/lrde/dload/olena/x.y./doc/') and ensure they are accessible
+ from the Web.
+
+ * Create a new page on the Olena Web site for the new release (e.g,
+ http://olena.lrde.epita.fr/OlenaXYZ for release x.y.z), update
+ the Download page (http://olena.lrde.epita.fr/Download) and make
+ an announcement on the main page (http://olena.lrde.epita.fr/).
+ Also update the link under the Download item of the left bar
+ (http://olena.lrde.epita.fr/WebContents).
+
+ * Likewise, announce the release on the Olena Trac
+ (https://trac.lrde.org/olena/).
+
+ * Make an announce on the LRDE Web site as well
+ (http://www.lrde.epita.fr/cgi-bin/twiki/view/Lrde/News).
+
+ * Finally, post an announce to annonce(a)lrde.epita.fr. See the files
+ `ANNOUNCE-x.y' at the root of the repository for models.
+
+ * Tag the commit COMMIT corresponding to the release in the
+ repository, and push it to the Git server.
+
+ git tag -m "Olena release x.y." olena-x.y COMMIT
+ git push tag olena-x.y
-`rebox.el' is a useful companion to Emacs, creating boxes with comment
-delimiters.
+ * After the release, do not forget to append an `a' to the release
+ number in `configure.ac's (e.g., turn `1.1' into `1.1a') to
+ prevent any mistake regarding version numbers in subsequent
+ releases. Create new (empty) sections in `NEWS' files
+ accordingly.
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-536-g922978e Have Milena be in charge of its own configuration and distribution.
by Roland Levillain
* configure.ac: Remove parts now handled by Milena's configure.ac.
* Makefile.am (ACLOCAL_AMFLAGS): Remove.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
Remove all Milena files.
(dist-hook): Do not regen Milena's unit tests, as Milena itself is
now in charge of this.
* NEWS, README: Update.
* build-aux/tex.mk,
* build-aux/texi2dvi,
Remove.
* build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
---
.gitignore | 3 -
ChangeLog | 16 +
Makefile.am | 67 +--
NEWS | 6 +-
README | 46 +-
build-aux/Makefile.am | 6 +-
build-aux/tex.mk | 47 --
build-aux/texi2dvi | 1959 -------------------------------------------------
configure.ac | 537 +-------------
9 files changed, 41 insertions(+), 2646 deletions(-)
delete mode 100644 build-aux/tex.mk
delete mode 100755 build-aux/texi2dvi
diff --git a/.gitignore b/.gitignore
index 60e1d08..4bc335c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,6 @@ Makefile
/autoscan.log
/config
/config.cache*
-/config.h
-/config.h?in*
-/config.hin
/config.log*
/config.status*
/configure
diff --git a/ChangeLog b/ChangeLog
index 16f6d3b..95f6f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Have Milena be in charge of its own configuration and distribution.
+
+ * configure.ac: Remove parts now handled by Milena's configure.ac.
+ * Makefile.am (ACLOCAL_AMFLAGS): Remove.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
+ Remove all Milena files.
+ (dist-hook): Do not regen Milena's unit tests, as Milena itself is
+ now in charge of this.
+ * NEWS, README: Update.
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi,
+ Remove.
+ * build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
+
2010-10-26 Roland Levillain <roland(a)lrde.epita.fr>
Move trimesh2 into Milena.
diff --git a/Makefile.am b/Makefile.am
index 81168a9..483ab5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-ACLOCAL_AMFLAGS = -I m4
-
SUBDIRS = build-aux milena
if ENABLE_SWILENA
@@ -47,76 +45,19 @@ REGEN_SUBDIRS += milena scribo
LRDE_STRIPPED_DIST_FILES = \
$(distdir)/Makefile.am \
- $(distdir)/configure.ac \
- $(distdir)/milena/mln/accu/math/all.hh \
- $(distdir)/milena/mln/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/fun_image.hh \
- $(distdir)/milena/mln/data/all.hh \
- $(distdir)/milena/mln/essential/routine.hh \
- $(distdir)/milena/mln/fun/all.hh \
- $(distdir)/milena/mln/fun/essential.hh \
- $(distdir)/milena/mln/fun/v2v/all.hh \
- $(distdir)/milena/mln/fun/v2v/essential.hh \
- $(distdir)/milena/mln/linear/all.hh \
- $(distdir)/milena/mln/trait/all.hh \
- $(distdir)/milena/mln/trait/ch_value.hh \
- $(distdir)/milena/mln/value/all.hh \
- $(distdir)/milena/mln/value/essential.hh \
- $(distdir)/milena/tests/Makefile.am \
- $(distdir)/milena/tests/convert/Makefile.am \
- $(distdir)/milena/tests/extract/Makefile.am \
- $(distdir)/milena/tests/fun/v2v/Makefile.am \
- $(distdir)/milena/tests/linear/Makefile.am \
- $(distdir)/milena/tests/linear/gaussian/Makefile.am \
- $(distdir)/milena/tests/registration/Makefile.am \
- $(distdir)/milena/tests/trait/ch_value.cc \
- $(distdir)/milena/tests/value/Makefile.am
+ $(distdir)/configure.ac
LRDE_NODIST_FILES = \
- $(distdir)/milena/tests/convert/to_hsl.cc \
- $(distdir)/milena/tests/extract/blue.cc \
- $(distdir)/milena/tests/extract/green.cc \
- $(distdir)/milena/tests/extract/hue.cc \
- $(distdir)/milena/tests/extract/lum.cc \
- $(distdir)/milena/tests/extract/red.cc \
- $(distdir)/milena/tests/extract/sat.cc \
- $(distdir)/milena/tests/fun/v2v/component.cc \
- $(distdir)/milena/tests/fun/v2v/hsl_to_rgb.cc \
- $(distdir)/milena/tests/fun/v2v/rgb_to_hsl.cc \
- $(distdir)/milena/tests/linear/gaussian.cc \
- $(distdir)/milena/tests/linear/gaussian/filter.cc \
- $(distdir)/milena/tests/registration/registration.cc \
- $(distdir)/milena/tests/value/stack.cc \
$(distdir)/scribo
-## FIXME: Running `build-aux/build_unit_test.sh' just to update
-## `milena/tests/unit_test/unit-tests.mk' is overkill:
-##
-## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
-## => We should just regen `unit-tests.mk', not the `.cc' files.
-##
-## 2. It visits (almost) all the directories and files under
-## milena/mln/ (which admittedly a smaller issue compared to the
-## previous one)
-## => Prune `unit-tests.mk' instead of regenerating it. The
-## simplest solution is probably to equip `unit-tests.mk' in the
-## first place with `<<lrde'/`>>' tags, then prune it with
-## dist-strip.
-##
-
# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files.
dist-hook:
for f in $(LRDE_STRIPPED_DIST_FILES); do \
$(top_srcdir)/build-aux/strip-lrde $$f; \
done; \
- rm -rf $(LRDE_NODIST_FILES) && \
- $(top_srcdir)/build-aux/build_unit_test.sh \
- $(distdir)/milena/mln \
- $(distdir)/milena/tests/unit_test \
- $(top_srcdir)/milena/tests/unit_test/disabled_tests \
- mln \
- && \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && \
( \
cd $(distdir); \
set -evx; \
diff --git a/NEWS b/NEWS
index 36bf98f..d8ac176 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
* Olena 1.0a
+ * Starting with Olena 1.1, Milena, Swilena and Scribo are
+ independent components of the project, distributed together
+ with the Olena package and as standalone packages.
+
* Olena 1.0 July 14, 2009
@@ -352,7 +356,7 @@ End:
----
-Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009 EPITA Research and
+Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009, 2010 EPITA Research and
Development Laboratory (LRDE)
This file is part of Olena.
diff --git a/README b/README
index cc49a02..6400941 100644
--- a/README
+++ b/README
@@ -336,7 +336,7 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
+ * the documentation in `/usr/local/share/doc/olena/`.
And optionally:
@@ -368,42 +368,17 @@ build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
m4
Extra Autoconf macros.
milena
+ Milena C++ library.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
-
- tools
- Example tools.
-
- mesh
- Some 3D meshes, mostly used for test purpose.
-
- img
- Some (2D) images, mostly used for test purpose.
-
- demos
- Demos of Milena.
+scribo
+ Olena-Scribo project.
swilena
-
- python
- Some Python bindings for Milena.
+ Swilena project.
===================
@@ -415,10 +390,10 @@ Olena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.0, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.0.1
=========================== =============================================
@@ -433,7 +408,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -457,11 +432,6 @@ There are other sources of interest in the distribution.
- Headline news about the project can be found in the file ``NEWS`` at
the root of the source tree.
-- The library reference HTML documentation, generated by Doxygen_, is
- located in ``doc/user/html/``.
-
-.. _Doxygen: http://www.doxygen.org
-
License
=======
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 0e1ad0f..7fa77cb 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -15,9 +15,5 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# texi2dvi: produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# Part of the Texinfo project (http://www.gnu.org/software/texinfo/).
-EXTRA_DIST = texi2dvi
-
# File generators.
-EXTRA_DIST += generate_dist_headers.sh build_unit_test.sh
+EXTRA_DIST = generate_dist_headers.sh build_unit_test.sh
diff --git a/build-aux/tex.mk b/build-aux/tex.mk
deleted file mode 100644
index da35475..0000000
--- a/build-aux/tex.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-## tex.mk -*- Makefile-Automake -*-
-
-## A small subset of LRDE's share/make/tex.mk.
-
-## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
-##
-## This file is part of Olena.
-##
-## Olena is free software: you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free
-## Software Foundation, version 2 of the License.
-##
-## Olena is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-
-build_aux_dir = $(top_srcdir)/build-aux
-
-TEXI2DVI = $(build_aux_dir)/texi2dvi
-TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch
-
-
-TEXI2PDF = $(TEXI2DVI) --pdf
-TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS)
-
-# 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
-
-.tex.pdf:
- $(TEXI2PDF) $(TEXI2PDF_FLAGS) -o $@ $<
-
-tex-mostlyclean:
- rm -rf tmp.t2d
-.PHONY: tex-mostlyclean
-# mostlyclean-local is an Automake special target.
-mostlyclean-local: tex-mostlyclean
-.PHONY: mostlyclean-local
diff --git a/build-aux/texi2dvi b/build-aux/texi2dvi
deleted file mode 100755
index fce73b9..0000000
--- a/build-aux/texi2dvi
+++ /dev/null
@@ -1,1959 +0,0 @@
-#! /bin/sh
-# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.157 2010/02/09 18:37:08 karl Exp $
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Noah Friedman.
-#
-# Please send bug reports, etc. to bug-texinfo(a)gnu.org.
-# If possible, please send a copy of the output of the script called with
-# the `--debug' option when making a bug report.
-
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
- && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-# No failure shall remain unpunished.
-set -e
-
-# This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.157 $'
-rcs_version=`set - $rcs_revision; echo $2`
-program=`echo $0 | sed -e 's!.*/!!'`
-
-build_mode=${TEXI2DVI_BUILD_MODE:-local}
-build_dir=${TEXI2DVI_BUILD_DIRECTORY:-.}
-
-# Initialize variables for option overriding and otherwise.
-# Don't use `unset' since old bourne shells don't have this command.
-# Instead, assign them an empty value.
-action=compile
-batch=false # interact normally
-catcode_special=maybe
-debug=false
-escape="\\"
-expand=false # true for expansion via makeinfo
-includes=
-line_error=true # pass --file-line-error to TeX
-max_iters=-1 # keep going forever
-oname= # --output
-out_lang=dvi
-quiet=false # let the tools' message be displayed
-recode=false
-set_language=
-src_specials=
-latex2html=hevea # or set to tex4ht
-textra= # Extra TeX commands to insert in the input file.
-txiprereq=19990129 # minimum texinfo.tex version with macro expansion
-verb=false # true for verbose mode
-translate_file= # name of charset translation file
-recode_from= # if not empty, recode from this encoding to @documentencoding
-
-orig_pwd=`pwd`
-
-# We have to initialize IFS to space tab newline since we save and
-# restore IFS and apparently POSIX allows stupid/broken behavior with
-# empty-but-set IFS.
-# http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
-# We need space, tab and new line, in precisely that order. And don't leave
-# trailing blanks.
-space=' '
-tab=' '
-newline='
-'
-IFS="$space$tab$newline"
-
-# In case someone pedantic insists on using grep -E.
-: ${EGREP=egrep}
-
-# Systems which define $COMSPEC or $ComSpec use semicolons to separate
-# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
-# might be inherited, but : is used.
-if test -n "$COMSPEC$ComSpec" \
- && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then
- path_sep=";"
-else
- path_sep=":"
-fi
-
-# Pacify verbose cds.
-CDPATH=${ZSH_VERSION+.}$path_sep
-
-# If $TEX is set to a directory, don't use it.
-test -n "$TEX" && test -d "$TEX" && unset TEX
-
-#
-## --------------------- ##
-## Auxiliary functions. ##
-## --------------------- ##
-
-# In case `local' is not supported by the shell, provide a function
-# that simulates it by simply performing the assignments. This means
-# that we must not expect `local' to work, i.e., we must not (i) rely
-# on it during recursion, and (ii) have two local declarations of the
-# same variable. (ii) is easy to check statically, and our test suite
-# does make sure there is never twice a static local declaration of a
-# variable. (i) cannot be checked easily, so just be careful.
-#
-# Note that since we might use a function simulating `local', we can
-# no longer rely on the fact that no IFS-splitting is performed. So,
-# while
-#
-# foo=$bar
-#
-# is fine (no IFS-splitting), never write
-#
-# local foo=$bar
-#
-# but rather
-#
-# local foo="$bar"
-(
- foo=bar
- test_local () {
- local foo=foo
- }
- test_local
- test $foo = bar
-) || local () {
- case $1 in
- *=*) eval "$1";;
- esac
-}
-
-
-# cd_orig
-# -------
-# Return to the original directory.
-cd_orig ()
-{
- # In case $orig_pwd is on a different drive (for DOS).
- cd /
-
- # Return to the original directory so that
- # - the next file is processed in correct conditions
- # - the temporary file can be removed
- cd "$orig_pwd" || exit 1
-}
-
-# func_dirname FILE
-# -----------------
-# Return the directory part of FILE.
-func_dirname ()
-{
- dirname "$1" 2>/dev/null \
- || { echo "$1" | sed 's!/[^/]*$!!;s!^$!.!'; }
-}
-
-
-# noexit FILE
-# -----------
-# Return FILE with one extension remove. foo.bar.baz -> foo.bar.
-noext ()
-{
- echo "$1" | sed -e 's/\.[^/.][^/.]*$//'
-}
-
-
-# absolute NAME -> ABS-NAME
-# -------------------------
-# Return an absolute path to NAME.
-absolute ()
-{
- case $1 in
- [\\/]* | ?:[\\/]*)
- # Absolute paths don't need to be expanded.
- echo "$1"
- ;;
- *) local slashes
- slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
- local rel
- rel=$orig_pwd/`func_dirname "$1"`
- if test -d "$rel"; then
- (cd "$rel" 2>/dev/null &&
- local n
- n=`pwd`/`basename "$1"`"$slashes"
- echo "$n")
- else
- error 1 "not a directory: $rel"
- fi
- ;;
- esac
-}
-
-
-# ensure_dir DIR1 DIR2...
-# -----------------------
-# Make sure the directories exist.
-ensure_dir ()
-{
- for dir
- do
- # Beware that in parallel builds we may have several concurrent
- # attempts to create the directory. So fail only if "mkdir"
- # failed *and* the directory still does not exist.
- test -d "$dir" \
- || mkdir "$dir" \
- || test -d "$dir" \
- || error 1 "cannot create directory: $dir"
- done
-}
-
-
-# error EXIT_STATUS LINE1 LINE2...
-# --------------------------------
-# Report an error and exit with failure if EXIT_STATUS is non null.
-error ()
-{
- local s="$1"
- shift
- report "$@"
- if test "$s" != 0; then
- exit $s
- fi
-}
-
-
-# findprog PROG
-# -------------
-# Return true if PROG is somewhere in PATH, else false.
-findprog ()
-{
- local saveIFS="$IFS"
- IFS=$path_sep # break path components at the path separator
- for dir in $PATH; do
- IFS=$saveIFS
- # The basic test for an executable is `test -f $f && test -x $f'.
- # (`test -x' is not enough, because it can also be true for directories.)
- # We have to try this both for $1 and $1.exe.
- #
- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
- # also `test -f' has this enhancement, but not on DJGPP. (Both are
- # design decisions, so there is little chance to make them consistent.)
- # Thusly, it seems to be difficult to make use of these enhancements.
- #
- if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
- return 0
- fi
- done
- return 1
-}
-
-# report LINE1 LINE2...
-# ---------------------
-# Report some information on stderr.
-report ()
-{
- for i in "$@"
- do
- echo >&2 "$0: $i"
- done
-}
-
-
-# run COMMAND-LINE
-# ----------------
-# Run the COMMAND-LINE verbosely, and catching errors as failures.
-run ()
-{
- verbose "Running $@"
- "$@" 2>&5 1>&2 ||
- error 1 "$1 failed"
-}
-
-
-# usage
-# -----
-# Display usage and exit successfully.
-usage ()
-{
- # We used to simply have `echo "$usage"', but coping with the
- # changing behavior of `echo' is much harder than simply using a
- # here-doc.
- #
- # echo '\noto' echo '\\noto' echo -e '\\noto'
- # bash 3.1 \noto \\noto \noto
- # bash 3.2 %oto \noto -e \noto
- #
- # where % denotes the eol character.
- cat <<EOF
-Usage: $program [OPTION]... FILE...
- texi2pdf [OPTION]... FILE...
- pdftexi2dvi [OPTION]... FILE...
-
-Run each Texinfo or (La)TeX FILE through TeX in turn until all
-cross-references are resolved, building all indices. The directory
-containing each FILE is searched for included files. The suffix of FILE
-is used to determine its language ((La)TeX or Texinfo). To process
-(e)plain TeX files, set the environment variable LATEX=tex.
-
-In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX,
-the FILE may also be composed of the following simple TeX commands.
- \`\\input{FILE}' the actual file to compile
- \`\\nonstopmode' same as --batch
-
-When invoked as \`texi2pdf' or \`pdftexi2dvi', or given the option --pdf
-or --dvipdf, generate PDF output. Otherwise, generate DVI.
-
-General options:
- -b, --batch no interaction
- -D, --debug turn on shell debugging (set -x)
- -h, --help display this help and exit successfully
- -o, --output=OFILE leave output in OFILE (implies --clean);
- only one input FILE may be specified in this case
- -q, --quiet no output unless errors (implies --batch)
- -s, --silent same as --quiet
- -v, --version display version information and exit successfully
- -V, --verbose report on what is done
-
-TeX tuning:
- -@ use @input instead of \input for preloaded Texinfo
- -e, -E, --expand force macro expansion using makeinfo
- -I DIR search DIR for Texinfo files
- -l, --language=LANG specify LANG for FILE, either latex or texinfo
- --no-line-error do not pass --file-line-error to TeX
- -r, --recode call recode before TeX to translate input
- --recode-from=ENC recode from ENC to the @documentencoding
- --src-specials pass --src-specials to TeX
- -t, --command=CMD insert CMD in copy of input file
- or --texinfo=CMD multiple values accumulate
- --translate-file=FILE use given charset translation file for TeX
-
-Output format:
- --dvi output a DVI file [default]
- --dvipdf output a PDF file via DVI (using dvipdf)
- --html output an HTML file. Use HeVeA for LaTeX files
- --info output an Info file. Use HeVeA for LaTeX files
- -p, --pdf use pdftex or pdflatex for processing
- --ps output a PDF file via DVI (using dvips)
- --text output a plain text file. Use HeVeA for LaTeX files
-
-Build modes:
- --build=MODE specify the treatment of auxiliary files [$build_mode]
- --tidy same as --build=tidy
- -c, --clean same as --build=clean
- --build-dir=DIR specify where the tidy compilation is performed;
- implies --tidy;
- defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
- --mostly-clean remove the auxiliary files and directories
- but not the output
- --max-iterations=N don't process files more than N times
-
-The MODE specifies where the TeX compilation takes place, and, as a
-consequence, how auxiliary files are treated. The build mode
-can also be set using the environment variable TEXI2DVI_BUILD_MODE.
-
-Valid MODEs are:
- \`local' compile in the current directory, leaving all the auxiliary
- files around. This is the traditional TeX use.
- \`tidy' compile in a local *.t2d directory, where the auxiliary files
- are left. Output files are copied back to the original file.
- \`clean' same as \`tidy', but remove the auxiliary directory afterwards.
- Every compilation therefore requires the full cycle.
-
-Using the \`tidy' mode brings several advantages:
- - the current directory is not cluttered with plethora of temporary files.
- - clutter can be even further reduced using --build-dir=dir: all the *.t2d
- directories are stored there.
- - clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
- or --build-dir=\$HOME/.t2d.
- - the output file is updated after every succesful TeX run, for
- sake of concurrent visualization of the output. In a \`local' build
- the viewer stops during the whole TeX run.
- - if the compilation fails, the previous state of the output file
- is preserved.
- - PDF and DVI compilation are kept in separate subdirectories
- preventing any possibility of auxiliary file incompatibility.
-
-On the other hand, because \`tidy' compilation takes place in another
-directory, occasionally TeX won't be able to find some files (e.g., when
-using \\graphicspath): in that case use -I to specify the additional
-directories to consider.
-
-The values of the BIBTEX, DVIPDF, DVIPS, LATEX, MAKEINDEX, MAKEINFO,
-PDFLATEX, PDFTEX, TEX, TEXINDEX, and THUMBPDF environment variables are used
-to run those commands, if they are set. Any CMD strings are added after
-@setfilename for Texinfo input, in the first line for LaTeX input.
-
-Report bugs to bug-texinfo(a)gnu.org,
-general questions and discussion to help-texinfo(a)gnu.org.
-GNU Texinfo home page: <http://www.gnu.org/software/texinfo/>
-General help using GNU software: <http://www.gnu.org/gethelp/>
-EOF
- exit 0
-}
-
-
-# verbose WORD1 WORD2
-# -------------------
-# Report some verbose information.
-verbose ()
-{
- if $verb; then
- echo >&2 "$0: $@"
- fi
-}
-
-
-# version
-# -------
-# Display version info and exit succesfully.
-version ()
-{
- cat <<EOF
-texi2dvi (GNU Texinfo 4.13) $rcs_version
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-EOF
- exit 0
-}
-
-
-## ---------------- ##
-## Handling lists. ##
-## ---------------- ##
-
-
-# list_append LIST-NAME ELEM
-# --------------------------
-# Set LIST-NAME to its former contents, with ELEM appended.
-list_append ()
-{
- local la_l="$1"
- shift
- eval set X \$$la_l "$@"
- shift
- eval $la_l=\""$@"\"
-}
-
-
-# list_concat_dirs LIST-NAME DIR-LIST
-# -----------------------------------
-# Append to LIST-NAME all the components (included empty) from
-# the $path_sep separated list DIR-LIST. Make the paths absolute.
-list_concat_dirs ()
-{
- local lcd_list="$1"
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_EMPTY="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- save_IFS=$IFS
- IFS=$path_sep
- set x `echo "$2" | eval sed $replace_EMPTY`; shift
- IFS=$save_IFS
- local dir
- for dir
- do
- case $dir in
- EMPTY)
- list_append $lcd_list ""
- ;;
- *)
- if test -d $dir; then
- dir=`absolute "$dir"`
- list_append $lcd_list "$dir"
- fi
- ;;
- esac
- done
-}
-
-
-# list_prefix LIST-NAME SEP -> STRING
-# -----------------------------------
-# Return a string that is composed of the LIST-NAME with each item
-# preceded by SEP.
-list_prefix ()
-{
- local lp_p="$2"
- eval set X \$$1
- shift
- local lp_res
- for i
- do
- lp_res="$lp_res \"$lp_p\" \"$i\""
- done
- echo "$lp_res"
-}
-
-# list_infix LIST-NAME SEP -> STRING
-# ----------------------------------
-# Same as list_prefix, but a separator.
-list_infix ()
-{
- eval set X \$$1
- shift
- local la_IFS="$IFS"
- IFS=$path_sep
- echo "$*"
- IFS=$la_IFS
-}
-
-# list_dir_to_abs LIST-NAME
-# -------------------------
-# Convert the list to using only absolute dir names.
-# Currently unused, but should replace absolute_filenames some day.
-list_dir_to_abs ()
-{
- local ld_l="$1"
- eval set X \$$ld_l
- shift
- local ld_res
- for dir
- do
- dir=`absolute "$dir"`
- test -d "$dir" || continue
- ld_res="$ld_res \"$dir\""
- done
- set X $ld_res; shift
- eval $ld_l=\"$@\"
-}
-
-
-## ------------------------------ ##
-## Language auxiliary functions. ##
-## ------------------------------ ##
-
-
-# out_lang_set LANG
-# -----------------
-out_lang_set ()
-{
- case $1 in
- dvi|dvipdf|html|info|pdf|ps|text) out_lang=$1;;
- *) error 1 "invalid output format: $1";;
- esac
-}
-
-
-# out_lang_tex
-# ------------
-# Return the tex output language (DVI or PDF) for $OUT_LANG.
-out_lang_tex ()
-{
- case $out_lang in
- dvi | ps | dvipdf ) echo dvi;;
- pdf ) echo $out_lang;;
- html | info | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-# out_lang_ext
-# ------------
-# Return the extension for $OUT_LANG.
-out_lang_ext ()
-{
- case $out_lang in
- dvipdf ) echo pdf;;
- dvi | html | info | pdf | ps | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-## ------------------------- ##
-## TeX auxiliary functions. ##
-## ------------------------- ##
-
-# Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
-# Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
-TEXINPUTS TFMFONTS"
-for var in $tex_envvars; do
- eval ${var}_orig=\$$var
- export $var
-done
-
-
-# absolute_filenames TEX-PATH -> TEX-PATH
-# ---------------------------------------
-# Convert relative paths to absolute paths, so we can run in another
-# directory (e.g., in tidy build mode, or during the macro-support
-# detection). Prepend ".".
-absolute_filenames ()
-{
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- local res
- res=`echo "$1" | eval sed $replace_empty`
- save_IFS=$IFS
- IFS=$path_sep
- set x $res; shift
- res=.
- for dir
- do
- case $dir in
- EMPTY)
- res=$res$path_sep
- ;;
- *)
- if test -d "$dir"; then
- res=$res$path_sep`absolute "$dir"`
- else
- # Even if $dir is not a directory, preserve it in the path.
- # It might contain metacharacters that TeX will expand in
- # turn, e.g., /some/path/{a,b,c}. This will not get the
- # implicit absolutification of the path, but we can't help that.
- res=$res$path_sep$dir
- fi
- ;;
- esac
- done
- echo "$res"
-}
-
-
-# output_base_name FILE
-# ---------------------
-# The name of FILE, possibly renamed to satisfy --output.
-# FILE is local, there is no directory part.
-output_base_name ()
-{
- case $oname in
- '') echo "$1";;
- *) local out_noext
- out_noext=`noext "$oname"`
- local file_ext
- file_ext=`echo "$1" | sed 's/^.*\.//'`
- echo "$out_noext.$file_ext"
- ;;
- esac
-}
-
-
-# destdir
-# -------
-# Return the name of the directory where the output is expected.
-destdir ()
-{
- case $oname in
- '') echo "$orig_pwd";;
- *) dirname "$oname";;
- esac
-}
-
-
-# move_to_dest FILE...
-# --------------------
-# Move FILE to the place where the user expects it. Truly move it, that
-# is, it must not remain in its build location unless that is also the
-# output location. (Otherwise it might appear as an extra file in make
-# distcheck.)
-#
-# FILE can be the principal output (in which case -o directly applies), or
-# an auxiliary file with the same base name.
-move_to_dest ()
-{
- # If we built in place, there is nothing to install, leave.
- case $tidy:$oname in
- false:) return;;
- esac
-
- local destfile
- local destdir
- local destbase
- local sourcedir
- local sourcebase
-
- for file
- do
- test -f "$file" ||
- error 1 "no such file or directory: $file"
- case $tidy:$oname in
- true:) destdir=$orig_pwd
- destfile=$destdir/$file;;
- *:*) destfile=`output_base_name "$file"`
- destdir=`dirname "$destfile"`;;
- esac
- # We want to compare the source location and the output location,
- # and if they are different, do the move. But if they are the
- # same, we must preserve the source. Since we can't assume
- # stat(1) or test -ef is available, resort to comparing the
- # directory names, canonicalized with pwd. We can't use cmp -s
- # since the output file might not actually change from run to run;
- # e.g., TeX DVI output is timestamped to only the nearest minute.
- destdir=`cd "$destdir" && pwd`
- destbase=`basename "$destfile"`
-
- sourcedir=`dirname "$file"`
- sourcedir=`cd "$sourcedir" && pwd`
- sourcebase=`basename "$file"`
-
- if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
- verbose "Moving $file to $destfile"
- rm -f "$destfile"
- mv "$file" "$destfile"
- fi
- done
-}
-
-
-## --------------------- ##
-## Managing xref files. ##
-## --------------------- ##
-
-# aux_file_p FILE
-# ---------------
-# Return with success if FILE is an aux file.
-aux_file_p ()
-{
- test -f "$1" || return 1
- case $1 in
- *.aux) return 0;;
- *) return 1;;
- esac
-}
-
-# bibaux_file_p FILE
-# ------------------
-# Return with success if FILE is an aux file containing citation
-# requests.
-bibaux_file_p ()
-{
- test -s "$1" || return 1
- if (grep '^\\bibstyle[{]' "$1" \
- && grep '^\\bibdata[{]' "$1" \
- ## The following line is suspicious: fails when there
- ## are citations in sub aux files. We need to be
- ## smarter in this case.
- ## && grep '^\\citation[{]' "$f"
- ) >&6 2>&1;
- then
- return 0
- fi
- return 1
-}
-
-# index_file_p FILE
-# -----------------
-# Return with success if FILE is an index file.
-index_file_p ()
-{
- test -f "$1" || return 1
- case $in_lang:$latex2html:`out_lang_tex`:`sed '1q' "$1"` in
- # When working with TeX4HT, *.idx are created by LaTeX. They must
- # be processed to produce *.4ix, *.4dx files. The *.4dx file is
- # passed to makeindex to produce the *.ind file. This sequence is
- # handled by run_index, so we are only interested in the *.idx
- # files, which have each "\indexentry" preceded by a
- # "\beforeentry".
- latex:tex4ht:html:"\\beforeentry {"*) return 0;;
-
- # When index.sty is used, there is a space before the brace.
- latex:*:*:"\\indexentry{"*|latex:*:*:"\\indexentry {"*) return 0;;
-
- texinfo:*:*:"\\entry{"*) return 0;;
-
- *) return 1;;
- esac
-}
-
-# xref_file_p FILE
-# ----------------
-# Return with success if FILE is an xref file (indexes, tables and lists).
-xref_file_p ()
-{
- test -f "$1" || return 1
- # If the file is not suitable to be an index or xref file, don't
- # process it. It's suitable if the first character is a
- # backslash or right quote or at, as long as the first line isn't
- # \input texinfo.
- case `sed '1q' "$1"` in
- "\\input texinfo"*) return 1;;
- [\\''@]*) return 0;;
- *) return 1;;
- esac
-}
-
-
-# generated_files_get FILENAME-NOEXT [PREDICATE-FILTER]
-# -----------------------------------------------------
-# Return the list of files generated by the TeX compilation of FILENAME-NOEXT.
-generated_files_get ()
-{
- local filter=true
- if test -n "$2"; then
- filter=$2
- fi
-
- # Gather the files created by TeX.
- (
- if test -f "$1.log"; then
- sed -n -e "s,^\\\\openout.* = \`\\(.*\\)'\\.,\\1,p" "$1.log"
- fi
- echo "$1.log"
- ) |
- # Depending on these files, infer outputs from other tools.
- while read file; do
- echo $file
- case $in_lang in
- texinfo)
- # texindex: texinfo.cp -> texinfo.cps
- if index_file_p $file; then
- echo ${file}s
- fi
- ;;
- latex)
- if aux_file_p $file; then
- # bibtex: *.aux -> *.bbl and *.blg.
- echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
- echo $file | sed 's/^\(.*\)\.aux$/\1.blg/'
- # -recorder: .fls
- echo $file | sed 's/^\(.*\)\.aux$/\1.fls/'
- fi
- ;;
- esac
- done |
- # Filter existing files matching the criterion.
- #
- # With an input file name containing a space, this produces a
- # "command not found" message (and filtering is ineffective).
- # The situation with a newline is presumably even worse.
- while read file; do
- if $filter "$file"; then
- echo $file
- fi
- done |
- sort |
- # Some files are opened several times, e.g., listings.sty's *.vrb.
- uniq
-}
-
-
-# xref_files_save
-# ---------------
-# Save the xref files.
-xref_files_save ()
-{
- # Save copies of auxiliary files for later comparison.
- xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
- if test -n "$xref_files_orig"; then
- verbose "Backing up xref files: $xref_files_orig"
- # The following line improves `cp $xref_files_orig "$work_bak"'
- # by preserving the directory parts. Think of
- # cp chap1/main.aux chap2/main.aux $work_bak.
- #
- # Users may have, e.g., --keep-old-files. Don't let this interfere.
- # (Don't use unset for the sake of ancient shells.)
- TAR_OPTIONS=; export TAR_OPTIONS
- tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
- fi
-}
-
-
-# xref_files_changed
-# ------------------
-# Whether the xref files were changed since the previous run.
-xref_files_changed ()
-{
- # LaTeX (and the package changebar) report in the LOG file if it
- # should be rerun. This is needed for files included from
- # subdirs, since texi2dvi does not try to compare xref files in
- # subdirs. Performing xref files test is still good since LaTeX
- # does not report changes in xref files.
- if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then
- return 0
- fi
-
- # If old and new lists don't at least have the same file list,
- # then one file or another has definitely changed.
- xref_files_new=`generated_files_get "$in_noext" xref_file_p`
- verbose "Original xref files = $xref_files_orig"
- verbose "New xref files = $xref_files_new"
- if test "x$xref_files_orig" != "x$xref_files_new"; then
- return 0
- fi
-
- # Compare each file until we find a difference.
- for this_file in $xref_files_new; do
- verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
- # cmp -s returns nonzero exit status if files differ.
- if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
- verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
- if $debug; then
- diff -u "$work_bak/$this_file" "$this_file"
- fi
- return 0
- fi
- done
-
- # No change.
- return 1
-}
-
-
-
-## ----------------------- ##
-## Running the TeX suite. ##
-## ----------------------- ##
-
-
-
-# run_tex ()
-# ----------
-# Run TeX as "$tex $in_input", taking care of errors and logs.
-run_tex ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:*:dvi|latex:tex4ht:html)
- tex=${LATEX:-latex};;
- latex:*:pdf)
- tex=${PDFLATEX:-pdflatex};;
- texinfo:*:dvi)
- # MetaPost also uses the TEX environment variable. If the user
- # has set TEX=latex for that reason, don't bomb out.
- case $TEX in
- *latex) tex=tex;; # don't bother trying to find etex
- *) tex=$TEX
- esac;;
- texinfo:*:pdf) tex=$PDFTEX;;
-
- *) error 1 "$out_lang not supported for $in_lang";;
- esac
-
- # do the special catcode trick for ~ in filenames only for Texinfo,
- # not LaTeX.
- if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
- catcode_special=true
- else
- catcode_special=false
- fi
-
- # Beware of aux files in subdirectories that require the
- # subdirectory to exist.
- case $in_lang:$tidy in
- latex:true)
- sed -n 's|^[ ]*\\include{\(.*\)/.*}.*|\1|p' "$in_input" |
- sort -u |
- while read d
- do
- ensure_dir "$work_build/$d"
- done
- ;;
- esac
-
- # Note that this will be used via an eval: quote properly.
- local cmd="$tex"
-
- # If possible, make TeX report error locations in GNU format.
- if $line_error; then
- if test "${tex_help:+set}" != set; then
- # Go to a temporary directory to try --help, since old versions that
- # don't accept --help will generate a texput.log.
- tex_help_dir=$t2ddir/tex_help
- ensure_dir "$tex_help_dir"
- tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1 || true`
- fi
- # The mk program and perhaps others want to parse TeX's
- # original error messages.
- case $tex_help in
- *file-line-error*) cmd="$cmd --file-line-error";;
- esac
- fi
-
- # Tell TeX about TCX file, if specified.
- test -n "$translate_file" && cmd="$cmd --translate-file=$translate_file"
-
- # Tell TeX to make source specials (for backtracking from output to
- # source, given a sufficiently smart editor), if specified.
- test -n "$src_specials" && cmd="$cmd $src_specials"
-
- # Tell TeX to be batch if requested.
- if $batch; then
- # \batchmode does not show terminal output at all, so we don't
- # want that. And even in batch mode, TeX insists on having input
- # from the user. Close its stdin to make it impossible.
- cmd="$cmd </dev/null '${escape}nonstopmode'"
- fi
-
- # we'd like to handle arbitrary input file names, especially
- # foo~bar/a~b.tex, since Debian likes ~ characters.
- if $catcode_special; then
- # $normaltilde is just to reduce line length in this source file.
- # The idea is to define \normaltilde as a catcode other ~ character,
- # then make the active ~ be equivalent to that, instead of the plain
- # TeX tie. Then when the active ~ appears in the filename, it will
- # be expanded to itself, as far as \input will see. (This is the
- # same thing that texinfo.tex does in general, BTW.)
- normaltilde="${escape}catcode126=12 ${escape}def${escape}normaltilde{~}"
- cmd="$cmd '$normaltilde${escape}catcode126=13 ${escape}let~\normaltilde '"
- fi
- # Other special (non-active) characters could be supported by
- # resetting their catcodes to other on the command line and changing
- # texinfo.tex to initialize everything to plain catcodes. Maybe someday.
-
- # append the \input command.
- cmd="$cmd '${escape}input'"
-
- # TeX's \input does not (easily or reliably) support whitespace
- # characters or other special characters in file names. Our intensive
- # use of absolute file names makes this worse: the enclosing directory
- # names may include white spaces. Improve the situation using a
- # symbolic link to the filename in the current directory, in tidy mode
- # only. Do not alter in_input.
- #
- # The filename is almost always tokenized using plain TeX conventions
- # (the exception would be if the user made a texinfo.fmt file). Not
- # all the plain TeX special characters cause trouble, but there's no
- # harm in making the link.
- #
- case $tidy:`func_dirname "$in_input"` in
- true:*["$space$tab$newline\"#\$%\\^_{}~"]*)
- _run_tex_file_name=`basename "$in_input"`
- if test ! -f "$_run_tex_file_name"; then
- # It might not be a file, clear it.
- run rm -f "$_run_tex_file_name"
- run ln -s "$in_input"
- fi
- cmd="$cmd '$_run_tex_file_name'"
- ;;
-
- *)
- cmd="$cmd '$in_input'"
- ;;
- esac
-
- verbose "$0: Running $cmd ..."
- if eval "$cmd" >&5; then
- case $out_lang in
- dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
- esac
- else
- error 1 "$tex exited with bad status, quitting."
- fi
-}
-
-# run_bibtex ()
-# -------------
-# Run bibtex on current file.
-# - If its input (AUX) exists.
-# - If some citations are missing (LOG contains `Citation').
-# or the LOG complains of a missing .bbl
-#
-# Don't try to be too smart:
-#
-# 1. Running bibtex only if the bbl file exists and is older than
-# the LaTeX file is wrong, since the document might include files
-# that have changed.
-#
-# 3. Because there can be several AUX (if there are \include's),
-# but a single LOG, looking for missing citations in LOG is
-# easier, though we take the risk to match false messages.
-run_bibtex ()
-{
- case $in_lang in
- latex) bibtex=${BIBTEX:-bibtex};;
- texinfo) return;;
- esac
-
- # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
- # The no .aux && \bibdata test is also for btxmac, in case it was the
- # first run of a bibtex-using document. Otherwise, it's possible that
- # bibtex would never be run.
- if test -r "$in_noext.aux" \
- && test -r "$in_noext.log" \
- && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
- || grep '.*Undefined citation' "$in_noext.log" \
- || grep 'No file .*\.bbl\.' "$in_noext.log") \
- || (grep 'No \.aux file' "$in_noext.log" \
- && grep '^\\bibdata' "$in_noext.aux")) \
- >&6 2>&1; \
- then
- for f in `generated_files_get "$in_noext" bibaux_file_p`
- do
- run $bibtex "$f"
- done
- fi
-}
-
-# run_index ()
-# ------------
-# Run texindex (or makeindex or texindy) on current index files. If
-# they already exist, and after running TeX a first time the index
-# files don't change, then there's no reason to run TeX again. But we
-# won't know that if the index files are out of date or nonexistent.
-run_index ()
-{
- local index_files=`generated_files_get $in_noext index_file_p`
- test -n "$index_files" ||
- return 0
-
- : ${MAKEINDEX:=makeindex}
- : ${TEXINDEX:=texindex}
- : ${TEXINDY:=texindy}
-
- local index_file
- local index_noext
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- for index_file in $index_files
- do
- index_noext=`noext "$index_file"`
- run tex \
- '\def\filename{{'"$index_noext"'}{idx}{4dx}{ind}}
- \input idxmake.4ht'
- run $MAKEINDEX -o $index_noext.ind $index_noext.4dx
- done
- ;;
-
- latex:*)
- if $TEXINDY --version >&6 2>&1; then
- run $TEXINDY $index_files
- else
- run $MAKEINDEX $index_files
- fi
- ;;
-
- texinfo:*)
- run $TEXINDEX $index_files
- ;;
- esac
-}
-
-
-# run_tex4ht ()
-# -------------
-# Run the last two phases of TeX4HT: tex4ht extracts the HTML from the
-# instrumented DVI file, and t4ht converts the figures and installs
-# the files when given -d.
-#
-# Because knowing exactly which files are created is complex (in
-# addition the names are not simple to compute), which makes it
-# difficult to install the output files in a second step, it is much
-# simpler to install directly the output files.
-run_tex4ht ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- : ${TEX4HT=tex4ht} ${T4HT=t4ht}
- run "$TEX4HT" "-f/$in_noext"
- # Do not remove the / after the destdir.
- run "$T4HT" "-d`destdir`/" "-f/$in_noext"
- ;;
- esac
-}
-
-
-# run_thumbpdf ()
-# ---------------
-run_thumbpdf ()
-{
- if test `out_lang_tex` = pdf \
- && test -r "$in_noext.log" \
- && grep 'thumbpdf\.sty' "$in_noext.log" >&6 2>&1; \
- then
- thumbpdf=${THUMBPDF:-thumbpdf}
- thumbcmd="$thumbpdf $in_dir/$in_noext"
- verbose "Running $thumbcmd ..."
- if $thumbcmd >&5; then
- run_tex
- else
- report "$thumbpdf exited with bad status." \
- "Ignoring its output."
- fi
- fi
-}
-
-
-# run_dvipdf FILE.dvi
-# -------------------
-# Convert FILE.dvi to FILE.pdf.
-run_dvipdf ()
-{
- # Find which dvi->pdf program is available.
- if test -z "$dvipdf"; then
- for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf;
- do
- if findprog $i; then
- dvipdf=$i
- fi
- done
- fi
- # These tools have varying interfaces, some 'input output', others
- # 'input -o output'. They all seem to accept 'input' only,
- # outputting using the expected file name.
- run $dvipdf "$1"
- if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
- error 1 "cannot find output file"
- fi
-}
-
-# run_tex_suite ()
-# ----------------
-# Run the TeX tools until a fix point is reached.
-run_tex_suite ()
-{
- # Move to the working directory.
- if $tidy; then
- verbose "cd $work_build"
- cd "$work_build" || exit 1
- fi
-
- # Count the number of cycles.
- local cycle=0
-
- while :; do
- # check for probably LaTeX loop (e.g. varioref)
- if test $cycle -eq "$max_iters"; then
- error 0 "Maximum of $max_iters cycles exceeded"
- break
- fi
-
- # report progress
- cycle=`expr $cycle + 1`
- verbose "Cycle $cycle for $command_line_filename"
-
- xref_files_save
-
- # We run bibtex first, because I can see reasons for the indexes
- # to change after bibtex is run, but I see no reason for the
- # converse.
- run_bibtex
- run_index
- run_core_conversion
-
- xref_files_changed || break
- done
-
- # If we were using thumbpdf and producing PDF, then run thumbpdf
- # and TeX one last time.
- run_thumbpdf
-
- # If we are using tex4ht, call it.
- run_tex4ht
-
- # Install the result if we didn't already (i.e., if the output is
- # dvipdf or ps).
- case $latex2html:$out_lang in
- *:dvipdf)
- run_dvipdf "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- *:ps)
- : {DVIPS=dvips}
- $DVIPS -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- esac
-
- cd_orig
-}
-
-## -------------------------------- ##
-## TeX processing auxiliary tools. ##
-## -------------------------------- ##
-
-
-# A sed script that preprocesses Texinfo sources in order to keep the
-# iftex sections only. We want to remove non TeX sections, and comment
-# (with `@c _texi2dvi') TeX sections so that makeinfo does not try to
-# parse them. Nevertheless, while commenting TeX sections, don't
-# comment @macro/@end macro so that makeinfo does propagate them.
-# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
-# (yet), makeinfo can't parse the TeX commands, so work around with sed.
-#
-# We assume that `@c _texi2dvi' starting a line is not present in the
-# document.
-#
-comment_iftex=\
-'/^@tex/,/^@end tex/{
- s/^/@c _texi2dvi/
-}
-/^@iftex/,/^@end iftex/{
- s/^/@c _texi2dvi/
- /^@c _texi2dvi@macro/,/^@c _texi2dvi@end macro/{
- s/^@c _texi2dvi//
- }
-}
-/^@ifnottex/,/^@end ifnottex/{
- s/^/@c (_texi2dvi)/
-}
-/^@ifinfo/,/^@end ifinfo/{
- /^@node/p
- /^@menu/,/^@end menu/p
- t
- s/^/@c (_texi2dvi)/
-}
-s/^@ifnotinfo/@c _texi2dvi@ifnotinfo/
-s/^@end ifnotinfo/@c _texi2dvi@end ifnotinfo/'
-
-# Uncommenting is simpler: remove any leading `@c texi2dvi'; repeated
-# copies can sneak in via macro invocations.
-uncomment_iftex='s/^@c _texi2dvi\(@c _texi2dvi\)*//'
-
-
-# run_makeinfo ()
-# ---------------
-# Expand macro commands in the original source file using Makeinfo.
-# Always use `end' footnote style, since the `separate' style
-# generates different output (arguably this is a bug in -E). Discard
-# main info output, the user asked to run TeX, not makeinfo.
-run_makeinfo ()
-{
- test $in_lang = texinfo \
- || return 0
-
- # Unless required by the user, makeinfo expansion is wanted only
- # if texinfo.tex is too old.
- if $expand; then
- makeinfo=${MAKEINFO:-makeinfo}
- else
- # Check if texinfo.tex performs macro expansion by looking for
- # its version. The version is a date of the form YEAR-MO-DA.
- # We don't need to use [0-9] to match the digits since anyway
- # the comparison with $txiprereq, a number, will fail with non
- # digits.
- # Run in a temporary directory to avoid leaving files.
- version_test_dir=$t2ddir/version_test
- ensure_dir "$version_test_dir"
- (
- cd "$version_test_dir"
- echo '\input texinfo.tex @bye' >txiversion.tex
- # Be sure that if tex wants to fail, it is not interactive:
- # close stdin.
- $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
- )
- if test $? != 0; then
- cat "$version_test_dir/txiversion.out"
- cat "$version_test_dir/txiversion.err" >&2
- error 1 "texinfo.tex appears to be broken, quitting."
- fi
- eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
- verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
- if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
- makeinfo=
- else
- makeinfo=${MAKEINFO:-makeinfo}
- fi
- # If TeX is preloaded, offer the user this convenience:
- if test "$txiformat" = Texinfo; then
- escape=@
- fi
- fi
-
- if test -n "$makeinfo"; then
- # in_src: the file with macros expanded.
- # Use the same basename to generate the same aux file names.
- work_src=$workdir/src
- ensure_dir "$work_src"
- in_src=$work_src/$in_base
- local miincludes
- miincludes=`list_prefix includes -I`
- verbose "Macro-expanding $command_line_filename to $in_src ..."
- # eval $makeinfo because it might be defined as something complex
- # (running missing) and then we end up with things like '"-I"',
- # and "-I" (including the quotes) is not an option name. This
- # happens with gettext 0.14.5, at least.
- sed "$comment_iftex" "$command_line_filename" \
- | eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
- -o /dev/null --macro-expand=- \
- | sed "$uncomment_iftex" >"$in_src"
- # Continue only if everything succeeded.
- if test $? -ne 0 \
- || test ! -r "$in_src"; then
- verbose "Expansion failed, ignored...";
- else
- in_input=$in_src
- fi
- fi
-}
-
-# insert_commands ()
-# ------------------
-# Used most commonly for @finalout, @smallbook, etc.
-insert_commands ()
-{
- if test -n "$textra"; then
- # _xtr. The file with the user's extra commands.
- work_xtr=$workdir/xtr
- in_xtr=$work_xtr/$in_base
- ensure_dir "$work_xtr"
- verbose "Inserting extra commands: $textra"
- local textra_cmd
- case $in_lang in
- latex) textra_cmd=1i;;
- texinfo) textra_cmd='/^@setfilename/a';;
- *) error 1 "internal error, unknown language: $in_lang";;
- esac
- sed "$textra_cmd\\
-$textra" "$in_input" >"$in_xtr"
- in_input=$in_xtr
- fi
-
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- # _tex4ht. The file with the added \usepackage{tex4ht}.
- work_tex4ht=$workdir/tex4ht
- in_tex4ht=$work_tex4ht/$in_base
- ensure_dir "$work_tex4ht"
- verbose "Inserting \\usepackage{tex4ht}"
- perl -pe 's<\\documentclass(?:\[.*\])?{.*}>
- <$&\\usepackage[xhtml]{tex4ht}>' \
- "$in_input" >"$in_tex4ht"
- in_input=$in_tex4ht
- ;;
- esac
-}
-
-# run_recode ()
-# -------------
-# If this is a Texinfo file with a specified input encoding, and
-# recode is available, then recode to plain 7 bit Texinfo.
-run_recode ()
-{
- local from
- local to
-
- if test $in_lang = texinfo; then
- pgm='s/^ *@documentencoding *\([^ ][^ ]*\) *$/\1/
- t found
- d
- :found
- q'
- encoding=`sed -e "$pgm" "$in_input"`
- if $recode && test -n "$encoding" && findprog recode; then
- if test -n "$recode_from"; then
- from=$recode_from
- to=$encoding
- else
- from=$encoding
- to=$texinfo
- fi
- verbose "Recoding from $from to $to."
- # _rcd. The Texinfo file recoded in 7bit.
- work_rcd=$workdir/recode
- in_rcd=$work_rcd/$in_base
- ensure_dir "$work_rcd"
- if recode "$encoding..$to" <"$in_input" >"$in_rcd" \
- && test -s "$in_rcd"; then
- in_input=$in_rcd
- else
- verbose "Recoding failed, using original input."
- fi
- fi
- fi
-}
-
-# compute_language FILENAME
-# -------------------------
-# Return the short string describing the language in which FILENAME
-# is written: `texinfo' or `latex'.
-compute_language ()
-{
- # If the user explicitly specified the language, use that.
- # Otherwise, if the first line is \input texinfo, assume it's texinfo.
- # Otherwise, guess from the file extension.
- if test -n "$set_language"; then
- echo $set_language
- elif sed 1q "$1" | grep 'input texinfo' >&6; then
- echo texinfo
- else
- # Get the type of the file (latex or texinfo) from the given language
- # we just guessed, or from the file extension if not set yet.
- case $1 in
- *.ltx | *.tex | *.drv | *.dtx) echo latex;;
- *) echo texinfo;;
- esac
- fi
-}
-
-
-# run_hevea (MODE)
-# ----------------
-# Convert to HTML/INFO/TEXT.
-#
-# Don't pass `-noiso' to hevea: it's useless in HTML since anyway the
-# charset is set to latin1, and troublesome in other modes since
-# accented characters loose their accents.
-#
-# Don't pass `-o DEST' to hevea because in that case it leaves all its
-# auxiliary files there too... Too bad, because it means we will need
-# to handle images some day.
-run_hevea ()
-{
- local hevea="${HEVEA:-hevea}"
- local run_hevea="$hevea"
-
- case $1 in
- html) ;;
- text|info) run_hevea="$run_hevea -$1";;
- *) error 1 "run_hevea: invalid argument: $1";;
- esac
-
- # Compiling to the tmp directory enables to preserve a previous
- # successful compilation.
- run_hevea="$run_hevea -fix -O -o '$out_base'"
- run_hevea="$run_hevea `list_prefix includes -I` -I '$orig_pwd' "
- run_hevea="$run_hevea '$in_input'"
-
- if $debug; then
- run_hevea="$run_hevea -v -v"
- fi
-
- verbose "running $run_hevea"
- if eval "$run_hevea" >&5; then
- # hevea leaves trailing white spaces, this is annoying.
- case $1 in text|info)
- perl -pi -e 's/[ \t]+$//g' "$out_base"*;;
- esac
- case $1 in
- html|text) move_to_dest "$out_base";;
- info) # There can be foo.info-1, foo.info-2 etc.
- move_to_dest "$out_base"*;;
- esac
- else
- error 1 "$hevea exited with bad status, quitting."
- fi
-}
-
-
-# run_core_conversion ()
-# ----------------------
-# Run the TeX (or HeVeA).
-run_core_conversion ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- *:dvi|*:pdf|latex:tex4ht:html)
- run_tex;;
- latex:*:html|latex:*:text|latex:*:info)
- run_hevea $out_lang;;
- *)
- error 1 "invalid input/output combination: $in_lang/$out_lang";;
- esac
-}
-
-
-# compile ()
-# ----------
-# Run the full compilation chain, from pre-processing to installation
-# of the output at its expected location.
-compile ()
-{
- # Source file might include additional sources.
- # We want `.:$orig_pwd' before anything else. (We'll add `.:' later
- # after all other directories have been turned into absolute paths.)
- # `.' goes first to ensure that any old .aux, .cps,
- # etc. files in ${directory} don't get used in preference to fresher
- # files in `.'. Include orig_pwd in case we are in clean build mode, where
- # we have cd'd to a temp directory.
- common="$orig_pwd$path_sep$in_dir$path_sep"
- #
- # If we have any includes, put those at the end.
- # Keep a final path_sep to get the default (system) TeX directories included.
- txincludes=`list_infix includes $path_sep`
- test -n "$txincludes" && common="$common$txincludes$path_sep"
- #
- for var in $tex_envvars; do
- eval val="\$common\$${var}_orig"
- # Convert relative paths to absolute paths, so we can run in another
- # directory (e.g., in clean build mode, or during the macro-support
- # detection). ".:" is added here.
- val=`absolute_filenames "$val"`
- eval $var="\"$val\""
- export $var
- eval verbose \"$var=\'\$${var}\'\"
- done
-
- # --expand
- run_makeinfo
-
- # --command, --texinfo
- insert_commands
-
- # --recode
- run_recode
-
- # Run until a fix point is reached.
- run_tex_suite
-}
-
-
-# remove FILES
-# ------------
-remove ()
-{
- verbose "Removing" "$@"
- rm -rf "$@"
-}
-
-
-# mostly_clean
-# ------------
-# Remove auxiliary files and directories. Changes the current directory.
-mostly_clean ()
-{
- cd_orig
- set X "$t2ddir"
- shift
- $tidy || {
- local log="$work_build/$in_noext.log"
- set X ${1+"$@"} "$log" `generated_files_get "$work_build/$in_noext"`
- shift
- }
- remove ${1+"$@"}
-}
-
-
-# cleanup ()
-# ----------
-# Remove what should be removed according to options.
-# Called at the end of each compilation cycle, and at the end of
-# the script. Changes the current directory.
-cleanup ()
-{
- case $build_mode in
- local) cd_orig; remove "$t2ddir";;
- clean) mostly_clean;;
- tidy) ;;
- esac
-}
-
-
-
-## ---------------------- ##
-## Command line parsing. ##
-## ---------------------- ##
-
-# Push a token among the arguments that will be used to notice when we
-# ended options/arguments parsing.
-# Use "set dummy ...; shift" rather than 'set - ..." because on
-# Solaris set - turns off set -x (but keeps set -e).
-# Use ${1+"$@"} rather than "$@" because Digital Unix and Ultrix 4.3
-# still expand "$@" to a single argument (the empty string) rather
-# than nothing at all.
-arg_sep="$$--$$"
-set dummy ${1+"$@"} "$arg_sep"; shift
-
-#
-# Parse command line arguments.
-while test x"$1" != x"$arg_sep"; do
-
- # Handle --option=value by splitting apart and putting back on argv.
- case "$1" in
- --*=*)
- opt=`echo "$1" | sed -e 's/=.*//'`
- val=`echo "$1" | sed -e 's/[^=]*=//'`
- shift
- set dummy "$opt" "$val" ${1+"$@"}; shift
- ;;
- esac
-
- # This recognizes --quark as --quiet. Oh well.
- case "$1" in
- -@ ) escape=@;;
- -~ ) catcode_special=false;;
- # Silently and without documentation accept -b and --b[atch] as synonyms.
- -b | --batch) batch=true;;
- --build) shift; build_mode=$1;;
- --build-dir) shift; build_dir=$1; build_mode=tidy;;
- -c | --clean) build_mode=clean;;
- -D | --debug) debug=true;;
- -e | -E | --expand) expand=true;;
- -h | --help) usage;;
- -I) shift; list_concat_dirs includes "$1";;
- -l | --lang | --language) shift; set_language=$1;;
- --mostly-clean) action=mostly-clean;;
- --no-line-error) line_error=false;;
- --max-iterations) shift; max_iters=$1;;
- -o | --out | --output)
- shift
- # Make it absolute, just in case we also have --clean, or whatever.
- oname=`absolute "$1"`;;
-
- # Output formats.
- -O|--output-format) shift; out_lang_set "$1";;
- --dvi|--dvipdf|--html|--info|--pdf|--ps|--text)
- out_lang_set `echo "x$1" | sed 's/^x--//'`;;
-
- -p) out_lang_set pdf;;
- -q | -s | --quiet | --silent) quiet=true; batch=true;;
- -r | --recode) recode=true;;
- --recode-from) shift; recode=true; recode_from="$1";;
- --src-specials) src_specials=--src-specials;;
- --tex4ht) latex2html=tex4ht;;
- -t | --texinfo | --command ) shift; textra="$textra\\
-"`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
- --translate-file ) shift; translate_file="$1";;
- --tidy) build_mode=tidy;;
- -v | --vers*) version;;
- -V | --verb*) verb=true;;
- --) # What remains are not options.
- shift
- while test x"$1" != x"$arg_sep"; do
- set dummy ${1+"$@"} "$1"; shift
- shift
- done
- break;;
- -*)
- error 1 "Unknown or ambiguous option \`$1'." \
- "Try \`--help' for more information."
- ;;
- *) set dummy ${1+"$@"} "$1"; shift;;
- esac
- shift
-done
-# Pop the token
-shift
-
-# $tidy: compile in a t2d directory.
-# $clean: remove all the aux files.
-case $build_mode in
- local) clean=false; tidy=false;;
- tidy) clean=false; tidy=true;;
- clean) clean=true; tidy=true;;
- *) error 1 "invalid build mode: $build_mode";;
-esac
-
-# Interpret remaining command line args as filenames.
-case $# in
- 0)
- error 2 "Missing file arguments." "Try \`--help' for more information."
- ;;
- 1) ;;
- *)
- if test -n "$oname"; then
- error 2 "Can't use option \`--output' with more than one argument."
- fi
- ;;
-esac
-
-
-# We can't do much without tex.
-#
-if findprog ${TEX:-tex}; then :; else cat <<EOM
-You don't have a working TeX binary (${TEX:-tex}) installed anywhere in
-your PATH, and texi2dvi cannot proceed without one. If you want to use
-this script, you'll need to install TeX (if you don't have it) or change
-your PATH or TEX environment variable (if you do). See the --help
-output for more details.
-
-For information about obtaining TeX, please see http://www.tug.org. If
-you happen to be using Debian, you can get it with this command:
- apt-get install tetex-bin
-EOM
- exit 1
-fi
-
-
-# We want to use etex (or pdftex) if they are available, and the user
-# didn't explicitly specify. We don't check for elatex and pdfelatex
-# because (as of 2003), the LaTeX team has asked that new distributions
-# use etex by default anyway.
-#
-# End up with the TEX and PDFTEX variables set to what we are going to use.
-if test -z "$TEX"; then
- if findprog etex; then TEX=etex; else TEX=tex; fi
-fi
-#
-if test -z "$PDFTEX"; then
- if findprog pdfetex; then PDFTEX=pdfetex; else PDFTEX=pdftex; fi
-fi
-
-
-# File descriptor usage:
-# 0 standard input
-# 1 standard output (--verbose messages)
-# 2 standard error
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 tools output (turned off by --quiet)
-# 6 tracing/debugging (set -x output, etc.)
-
-
-# Main tools' output (TeX, etc.) that TeX users are used to seeing.
-#
-# If quiet, discard, else redirect to the message flow.
-if $quiet; then
- exec 5>/dev/null
-else
- exec 5>&1
-fi
-
-
-# Enable tracing, and auxiliary tools output.
-#
-# Should be used where you'd typically use /dev/null to throw output
-# away. But sometimes it is convenient to see that output (e.g., from
-# a grep) to aid debugging. Especially debugging at distance, via the
-# user.
-if $debug; then
- exec 6>&1
- set -x
-else
- exec 6>/dev/null
-fi
-
-#
-
-# input_file_name_decode
-# ----------------------
-# Decode COMMAND_LINE_FILENAME, and compute:
-# - COMMAND_LINE_FILENAME clean of TeX commands
-# - IN_DIR
-# The directory to the input file, possibly absolute if needed.
-# - IN_DIR_ABS
-# The absolute directory of the input file.
-# - IN_BASE
-# The input file base name (no directory part).
-# - IN_NOEXT
-# The input file name without extensions (nor directory part).
-# - IN_INPUT
-# Defaults to COMMAND_LINE_FILENAME, but might change if the
-# input is preprocessed (recode etc.). With directory, possibly absolute.
-input_file_name_decode ()
-{
- # See if we are run from within AUC-Tex, in which case we are
- # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
- case $command_line_filename in
- *\\nonstopmode*)
- batch=true;;
- esac
- case $command_line_filename in
- *\\input{*}*)
- # Let AUC-TeX error parser deal with line numbers.
- line_error=false
- command_line_filename=`\
- expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
- ;;
- esac
-
- # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
- # prepend `./' in order to avoid that the tools take it as an option.
- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
- || command_line_filename="./$command_line_filename"
-
- # See if the file exists. If it doesn't we're in trouble since, even
- # though the user may be able to reenter a valid filename at the tex
- # prompt (assuming they're attending the terminal), this script won't
- # be able to find the right xref files and so forth.
- test -r "$command_line_filename" ||
- error 1 "cannot read $command_line_filename, skipping."
-
- # Get the name of the current directory.
- in_dir=`func_dirname "$command_line_filename"`
- in_dir_abs=`absolute "$in_dir"`
- # In a clean build, we `cd', so get an absolute file name.
- if $tidy; then
- in_dir=$in_dir_abs
- fi
-
- # Strip directory part but leave extension.
- in_base=`basename "$command_line_filename"`
- # Strip extension.
- in_noext=`noext "$in_base"`
-
- # The normalized file name to compile. Must always point to the
- # file to actually compile (in case of recoding, macro-expansion etc.).
- in_input=$in_dir/$in_base
-
-
- # Compute the output file name.
- if test x"$oname" != x; then
- out_name=$oname
- else
- out_name=$in_noext.`out_lang_ext`
- fi
- out_dir=`func_dirname "$out_name"`
- out_dir_abs=`absolute "$out_dir"`
- out_base=`basename "$out_name"`
- out_noext=`noext "$out_base"`
-}
-
-
-## -------------- ##
-## TeXify files. ##
-## -------------- ##
-
-for command_line_filename
-do
- verbose "Processing $command_line_filename ..."
-
- input_file_name_decode
-
- # `texinfo' or `latex'?
- in_lang=`compute_language "$command_line_filename"`
-
- # An auxiliary directory used for all the auxiliary tasks involved
- # in compiling this document.
- case $build_dir in
- '' | . ) t2ddir=$out_noext.t2d ;;
- *) # Avoid collisions between multiple occurrences of the same
- # file, so depend on the output path. Remove leading `./',
- # at least to avoid creating a file starting with `.!', i.e.,
- # an invisible file. The sed expression is fragile if the cwd
- # has active characters. Transform / into ! so that we don't
- # need `mkdir -p'. It might be something to reconsider.
- t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
- sed "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
- esac
- # Remove it at exit if clean mode.
- trap "cleanup" 0 1 2 15
-
- ensure_dir "$build_dir" "$t2ddir"
-
- # We will change directory, better work with an absolute path...
- t2ddir=`absolute "$t2ddir"`
- # Sometimes there are incompatibilities between auxiliary files for
- # DVI and PDF. The contents can also change whether we work on PDF
- # and/or DVI. So keep separate spaces for each.
- workdir=$t2ddir/`out_lang_tex`
- ensure_dir "$workdir"
-
- # _build. In a tidy build, where the auxiliary files are output.
- if $tidy; then
- work_build=$workdir/build
- else
- work_build=.
- fi
-
- # _bak. Copies of the previous auxiliary files (another round is
- # run if they differ from the new ones).
- work_bak=$workdir/bak
-
- # Make those directories.
- ensure_dir "$work_build" "$work_bak"
-
- case $action in
- compile)
- # Compile the document.
- compile
- cleanup
- ;;
-
- mostly-clean)
- mostly_clean
- ;;
- esac
-done
-
-verbose "done."
-exit 0 # exit successfully, not however we ended the loop.
diff --git a/configure.ac b/configure.ac
index 074672f..8d281ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,6 @@ AC_PREREQ([2.61])
AC_INIT([Olena], [1.0a], [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])
@@ -36,125 +33,14 @@ AC_CONFIG_FILES([build-aux/Makefile])
# Automake.
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
-# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
- [Package Full name.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
- [Bug report address.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_STRING], ["$PACKAGE_STRING"],
- [Full name and version.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"],
- [Package Version.])
-
-## --------------------- ##
-## C++ compiler set up. ##
-## --------------------- ##
-
-# If the user doesn't provide any CXXFLAGS, prevent Autoconf from
-# settings its own default ones (e.g., `-g -O2' for g++).
-if test ! ${CXXFLAGS+set}; then
- CXXFLAGS=""
-fi
-
-# Look for a C++ compiler.
-AC_LANG([C++])
-AC_PROG_CXX
-
-# Set `ICPC' to `yes' if the Intel C++ compiler is used.
-test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes
-
-# GNU C++ compiler setup.
-if test "$GXX" = yes; then
- # Speed up compiling times.
- CXXFLAGS="$CXXFLAGS -pipe"
-
- # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
- # a high optimization level (`-O3') and without
- # `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
- # Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
- #
- # So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
- # to `-fno-strict-aliasing'.
- if $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then
- STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing
- fi
-fi
-AC_SUBST([STRICT_ALIASING_CXXFLAGS])
-
-
-# Adjusting warning options according to compilers.
-AC_ARG_VAR([WARNINGS_CXXFLAGS], [C++ compiler warning flags])
-case "$CXX" in
- # Intel compiler
- *icpc*)
- WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418"
- ;;
- *)
- WARNINGS_CXXFLAGS="-Wall -W"
- ;;
-esac
-
-
-# ------------------------------ #
-# C++ compiler flags for tests. #
-# ------------------------------ #
-
-# FIXME: We might want to write an Autoconf macro to factor this.
-
-# Standard flags for tests.
-AC_ARG_VAR([TESTS_CXXFLAGS], [C++ compiler flags for tests])
-# We want no optimization for the tests (it slows down compiling
-# times), and debugging information.
-if test -z "$TESTS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for complex tests.
-AC_ARG_VAR([TESTS_CXXFLAGS_SPEED],
- [C++ compiler optimization flags for (complex) tests])
-# We want optimization for complex tests, and keep debugging flags
-# (still useful).
-if test -z "$TESTS_CXXFLAGS_SPEED"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for tests with with all debugging features turned on.
-AC_ARG_VAR([TESTS_CXXFLAGS_DEBUG], [C++ compiler debug flags])
-# We want no optimization for the tests (it slows down compiling
-# times), and a lot of debugging features.
-# * GNU C++ Library Debug Mode:
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html
-# * GNU C++ Library Compile Time Checks (a.k.a. concept checking):
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch29.html
-if test -z "$TESTS_CXXFLAGS_DEBUG"; then
- if test "$GXX" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -ggdb $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- elif test "$ICPC" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -g $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- fi
-fi
+AC_CONFIG_FILES([Makefile])
## ------------------------------ ##
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (Swilena, Scribo, etc). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -163,91 +49,19 @@ fi
AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
- enable_trimesh=yes
enable_swilena=yes
dnl<<lrde
enable_scribo=yes
dnl>>
- enable_apps=yes
- enable_tools=yes
fi])
-## ------------------ ##
-## Libraries set up. ##
-## ------------------ ##
-
-# Use Libtool.
-# To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used.
-AC_PROG_LIBTOOL
-
-# Check for Darwin.
-AC_CANONICAL_HOST
-AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
-
-
-## -------------------- ##
-## External libraries. ##
-## -------------------- ##
-
-# ------- #
-# Boost. #
-# ------- #
-
-BOOST_TUPLE
-AM_CONDITIONAL([HAVE_BOOST_TUPLE],
- [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes])
-
-# ----------------- #
-# CFITSIO library. #
-# ----------------- #
-
-OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio])
-
-# ---------- #
-# Magick++. #
-# ---------- #
-
-OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx],
- [MAGICKXX], [], [ImageMagick++])
-
-# ---- #
-# Qt. #
-# ---- #
-
-AT_WITH_QT([xml], [], [], [:], [oln_have_qt=yes])
-if test x$oln_have_qt = xyes; then
- AT_REQUIRE_QT_VERSION([4],
- AC_MSG_WARN([Qt-dependent programs will be disabled.]),
- oln_have_expected_qt_version=yes)
-fi
-AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes])
-
-# -------------- #
-# TIFF library. #
-# -------------- #
-
-OLN_WITH_LIB([TIFF], [tiff.h], [tiff])
-
-# --------------------------------- #
-# GDCM library (Grassroots DiCom). #
-# --------------------------------- #
-
-OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
- [GDCM],
- m4_do([-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF],
- [ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
- [ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+## -------- ##
+## Milena. ##
+## -------- ##
-AC_ARG_ENABLE([trimesh],
- [AS_HELP_STRING([--enable-trimesh],
- [build the (bundled) trimesh2 library])])
-AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
+# Milena is always enabled.
+AC_CONFIG_SUBDIRS([milena])
## --------- ##
@@ -274,341 +88,4 @@ AC_CONFIG_SUBDIRS([scribo])
dnl>>
-## --------------- ##
-## Configuration. ##
-## --------------- ##
-
-# Ask for config.h creation.
-AC_CONFIG_HEADERS([config.h])
-
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
-# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
-
-# Ask for the Makefile creations.
-AC_CONFIG_FILES([
- Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
-])
-
-
-## ------- ##
-## Tests. ##
-## ------- ##
-
-# Ask for the creation of a milena/tests/data.hh, used to access to
-# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
-
-# Ask for the creation of tests' Makefiles.
-AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- 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/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
-])
-
-dnl<<lrde
-AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
-])
-dnl>>
-
-
-## -------------- ##
-## Applications. ##
-## -------------- ##
-
-# Ask for the creation of a milena/apps/data.hh, used to access to
-# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
-
-AC_ARG_ENABLE([apps],
- [AS_HELP_STRING([--enable-apps],
- [enable application])])
-AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
-
-# Ask for the creation of applications' Makefiles.
-AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
-])
-
-# Configure tests.
-# FIXME: Consider using `sed' instead of `configure' to create these
-# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
-
-# Flags for apps.
-AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
-# We want fast binaries for apps.
-if test -z "$APPS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-## ------- ##
-## Tools. ##
-## ------- ##
-
-AC_ARG_ENABLE([tools],
- [AS_HELP_STRING([--enable-tools], [enable tools])])
-AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
-
-# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
-
-# Flags for tools.
-AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
-# We want fast binaries for tools.
-if test -z "$TOOLS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-
-## ----------------- ##
-## Verbose display. ##
-## ----------------- ##
-
-# Do not print this information by default, since `configure' outputs
-# should be kept short. Longer explanations are always available in
-# config.log.
-
-AC_ARG_ENABLE([verbose],
- [AS_HELP_STRING([--enable-verbose], [enable verbose display])],
- [if test "x$enable_verbose" != xno; then
- AC_MSG_RESULT([
--------------------------------------------------------------------------------
-Configuration summary.
-
-
-Host system type: $host
-Build system type: $build
-
-================
-| Dependencies |
-================
-
-
- Option Enabled and available
--------------------------------------------------------------------------------
-Boost Tuple --with-boost=@<:@=DIR@:>@ $oln_have_boost_tuple
-CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
-GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
-Magick++ --with-magickxx $oln_have_magickxx
-Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
-TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
--------------------------------------------------------------------------------
-
-
-
-
-=============
-| Utilities |
-=============
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Apps --enable-apps $enable_apps
-Tools --enable-tools $enable_tools
--------------------------------------------------------------------------------
-
-
-
-Options used to compile and link:
- PREFIX = $PREFIX_DIR
- EXEC-PREFIX = $EXEC_PREFIX_DIR
- VERSION = $PACKAGE_VERSION
- CC = $CC
- CFLAGS = $CFLAGS
- CPPFLAGS = $MAGICK_CPPFLAGS
- DEFS = $DEFS
- LDFLAGS = $LDFLAGS
- LIBS = $MAGICK_LIBS
- CXX = $CXX
- CXXFLAGS = $CXXFLAGS
- PKG_CONFIG = $PKG_CONFIG
- QT_PATH = $QT_PATH
- QMAKE = $QMAKE
- MOC = $MOC
- UIC = $UIC
- RCC = $RCC
- BOOST_ROOT = $BOOST_ROOT
- MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS
- MAGICKXX_LIBS = $MAGICKXX_LDFLAGS
- APPS_CXXFLAGS = $APPS_CXXFLAGS
- TOOLS_CXXFLAGS = $TOOLS_CXXFLAGS
-
-
-
-*******************************************************************************
-Olena is configured as stated above. Please verify that this configuration
-matches your expectations.
-
-Then, type 'make' to build Olena and 'make install' to install it on
-your system.
-])
-fi])
-
-
-## -------- ##
-## Output. ##
-## -------- ##
-
AC_OUTPUT
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-535-ge0bd301 Have Milena be in charge of its own configuration and distribution.
by Roland Levillain
* configure.ac: Remove parts now handled by Milena's configure.ac.
* Makefile.am (ACLOCAL_AMFLAGS): Remove.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
Remove all Milena files.
(dist-hook): Do not regen Milena's unit tests, as Milena itself is
now in charge of this.
* NEWS, README: Update.
* build-aux/tex.mk,
* build-aux/texi2dvi,
Remove.
* build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
---
.gitignore | 3 -
ChangeLog | 16 +
Makefile.am | 67 +--
NEWS | 6 +-
README | 46 +-
build-aux/Makefile.am | 6 +-
build-aux/tex.mk | 47 --
build-aux/texi2dvi | 1959 -------------------------------------------------
configure.ac | 537 +-------------
9 files changed, 41 insertions(+), 2646 deletions(-)
delete mode 100644 build-aux/tex.mk
delete mode 100755 build-aux/texi2dvi
diff --git a/.gitignore b/.gitignore
index 60e1d08..4bc335c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,6 @@ Makefile
/autoscan.log
/config
/config.cache*
-/config.h
-/config.h?in*
-/config.hin
/config.log*
/config.status*
/configure
diff --git a/ChangeLog b/ChangeLog
index 16f6d3b..95f6f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Have Milena be in charge of its own configuration and distribution.
+
+ * configure.ac: Remove parts now handled by Milena's configure.ac.
+ * Makefile.am (ACLOCAL_AMFLAGS): Remove.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
+ Remove all Milena files.
+ (dist-hook): Do not regen Milena's unit tests, as Milena itself is
+ now in charge of this.
+ * NEWS, README: Update.
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi,
+ Remove.
+ * build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
+
2010-10-26 Roland Levillain <roland(a)lrde.epita.fr>
Move trimesh2 into Milena.
diff --git a/Makefile.am b/Makefile.am
index 81168a9..483ab5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-ACLOCAL_AMFLAGS = -I m4
-
SUBDIRS = build-aux milena
if ENABLE_SWILENA
@@ -47,76 +45,19 @@ REGEN_SUBDIRS += milena scribo
LRDE_STRIPPED_DIST_FILES = \
$(distdir)/Makefile.am \
- $(distdir)/configure.ac \
- $(distdir)/milena/mln/accu/math/all.hh \
- $(distdir)/milena/mln/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/fun_image.hh \
- $(distdir)/milena/mln/data/all.hh \
- $(distdir)/milena/mln/essential/routine.hh \
- $(distdir)/milena/mln/fun/all.hh \
- $(distdir)/milena/mln/fun/essential.hh \
- $(distdir)/milena/mln/fun/v2v/all.hh \
- $(distdir)/milena/mln/fun/v2v/essential.hh \
- $(distdir)/milena/mln/linear/all.hh \
- $(distdir)/milena/mln/trait/all.hh \
- $(distdir)/milena/mln/trait/ch_value.hh \
- $(distdir)/milena/mln/value/all.hh \
- $(distdir)/milena/mln/value/essential.hh \
- $(distdir)/milena/tests/Makefile.am \
- $(distdir)/milena/tests/convert/Makefile.am \
- $(distdir)/milena/tests/extract/Makefile.am \
- $(distdir)/milena/tests/fun/v2v/Makefile.am \
- $(distdir)/milena/tests/linear/Makefile.am \
- $(distdir)/milena/tests/linear/gaussian/Makefile.am \
- $(distdir)/milena/tests/registration/Makefile.am \
- $(distdir)/milena/tests/trait/ch_value.cc \
- $(distdir)/milena/tests/value/Makefile.am
+ $(distdir)/configure.ac
LRDE_NODIST_FILES = \
- $(distdir)/milena/tests/convert/to_hsl.cc \
- $(distdir)/milena/tests/extract/blue.cc \
- $(distdir)/milena/tests/extract/green.cc \
- $(distdir)/milena/tests/extract/hue.cc \
- $(distdir)/milena/tests/extract/lum.cc \
- $(distdir)/milena/tests/extract/red.cc \
- $(distdir)/milena/tests/extract/sat.cc \
- $(distdir)/milena/tests/fun/v2v/component.cc \
- $(distdir)/milena/tests/fun/v2v/hsl_to_rgb.cc \
- $(distdir)/milena/tests/fun/v2v/rgb_to_hsl.cc \
- $(distdir)/milena/tests/linear/gaussian.cc \
- $(distdir)/milena/tests/linear/gaussian/filter.cc \
- $(distdir)/milena/tests/registration/registration.cc \
- $(distdir)/milena/tests/value/stack.cc \
$(distdir)/scribo
-## FIXME: Running `build-aux/build_unit_test.sh' just to update
-## `milena/tests/unit_test/unit-tests.mk' is overkill:
-##
-## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
-## => We should just regen `unit-tests.mk', not the `.cc' files.
-##
-## 2. It visits (almost) all the directories and files under
-## milena/mln/ (which admittedly a smaller issue compared to the
-## previous one)
-## => Prune `unit-tests.mk' instead of regenerating it. The
-## simplest solution is probably to equip `unit-tests.mk' in the
-## first place with `<<lrde'/`>>' tags, then prune it with
-## dist-strip.
-##
-
# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files.
dist-hook:
for f in $(LRDE_STRIPPED_DIST_FILES); do \
$(top_srcdir)/build-aux/strip-lrde $$f; \
done; \
- rm -rf $(LRDE_NODIST_FILES) && \
- $(top_srcdir)/build-aux/build_unit_test.sh \
- $(distdir)/milena/mln \
- $(distdir)/milena/tests/unit_test \
- $(top_srcdir)/milena/tests/unit_test/disabled_tests \
- mln \
- && \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && \
( \
cd $(distdir); \
set -evx; \
diff --git a/NEWS b/NEWS
index 36bf98f..d8ac176 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
* Olena 1.0a
+ * Starting with Olena 1.1, Milena, Swilena and Scribo are
+ independent components of the project, distributed together
+ with the Olena package and as standalone packages.
+
* Olena 1.0 July 14, 2009
@@ -352,7 +356,7 @@ End:
----
-Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009 EPITA Research and
+Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009, 2010 EPITA Research and
Development Laboratory (LRDE)
This file is part of Olena.
diff --git a/README b/README
index cc49a02..6400941 100644
--- a/README
+++ b/README
@@ -336,7 +336,7 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
+ * the documentation in `/usr/local/share/doc/olena/`.
And optionally:
@@ -368,42 +368,17 @@ build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
m4
Extra Autoconf macros.
milena
+ Milena C++ library.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
-
- tools
- Example tools.
-
- mesh
- Some 3D meshes, mostly used for test purpose.
-
- img
- Some (2D) images, mostly used for test purpose.
-
- demos
- Demos of Milena.
+scribo
+ Olena-Scribo project.
swilena
-
- python
- Some Python bindings for Milena.
+ Swilena project.
===================
@@ -415,10 +390,10 @@ Olena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.0, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.0.1
=========================== =============================================
@@ -433,7 +408,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -457,11 +432,6 @@ There are other sources of interest in the distribution.
- Headline news about the project can be found in the file ``NEWS`` at
the root of the source tree.
-- The library reference HTML documentation, generated by Doxygen_, is
- located in ``doc/user/html/``.
-
-.. _Doxygen: http://www.doxygen.org
-
License
=======
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 0e1ad0f..7fa77cb 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -15,9 +15,5 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# texi2dvi: produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# Part of the Texinfo project (http://www.gnu.org/software/texinfo/).
-EXTRA_DIST = texi2dvi
-
# File generators.
-EXTRA_DIST += generate_dist_headers.sh build_unit_test.sh
+EXTRA_DIST = generate_dist_headers.sh build_unit_test.sh
diff --git a/build-aux/tex.mk b/build-aux/tex.mk
deleted file mode 100644
index da35475..0000000
--- a/build-aux/tex.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-## tex.mk -*- Makefile-Automake -*-
-
-## A small subset of LRDE's share/make/tex.mk.
-
-## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
-##
-## This file is part of Olena.
-##
-## Olena is free software: you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free
-## Software Foundation, version 2 of the License.
-##
-## Olena is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-
-build_aux_dir = $(top_srcdir)/build-aux
-
-TEXI2DVI = $(build_aux_dir)/texi2dvi
-TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch
-
-
-TEXI2PDF = $(TEXI2DVI) --pdf
-TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS)
-
-# 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
-
-.tex.pdf:
- $(TEXI2PDF) $(TEXI2PDF_FLAGS) -o $@ $<
-
-tex-mostlyclean:
- rm -rf tmp.t2d
-.PHONY: tex-mostlyclean
-# mostlyclean-local is an Automake special target.
-mostlyclean-local: tex-mostlyclean
-.PHONY: mostlyclean-local
diff --git a/build-aux/texi2dvi b/build-aux/texi2dvi
deleted file mode 100755
index fce73b9..0000000
--- a/build-aux/texi2dvi
+++ /dev/null
@@ -1,1959 +0,0 @@
-#! /bin/sh
-# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.157 2010/02/09 18:37:08 karl Exp $
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Noah Friedman.
-#
-# Please send bug reports, etc. to bug-texinfo(a)gnu.org.
-# If possible, please send a copy of the output of the script called with
-# the `--debug' option when making a bug report.
-
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
- && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-# No failure shall remain unpunished.
-set -e
-
-# This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.157 $'
-rcs_version=`set - $rcs_revision; echo $2`
-program=`echo $0 | sed -e 's!.*/!!'`
-
-build_mode=${TEXI2DVI_BUILD_MODE:-local}
-build_dir=${TEXI2DVI_BUILD_DIRECTORY:-.}
-
-# Initialize variables for option overriding and otherwise.
-# Don't use `unset' since old bourne shells don't have this command.
-# Instead, assign them an empty value.
-action=compile
-batch=false # interact normally
-catcode_special=maybe
-debug=false
-escape="\\"
-expand=false # true for expansion via makeinfo
-includes=
-line_error=true # pass --file-line-error to TeX
-max_iters=-1 # keep going forever
-oname= # --output
-out_lang=dvi
-quiet=false # let the tools' message be displayed
-recode=false
-set_language=
-src_specials=
-latex2html=hevea # or set to tex4ht
-textra= # Extra TeX commands to insert in the input file.
-txiprereq=19990129 # minimum texinfo.tex version with macro expansion
-verb=false # true for verbose mode
-translate_file= # name of charset translation file
-recode_from= # if not empty, recode from this encoding to @documentencoding
-
-orig_pwd=`pwd`
-
-# We have to initialize IFS to space tab newline since we save and
-# restore IFS and apparently POSIX allows stupid/broken behavior with
-# empty-but-set IFS.
-# http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
-# We need space, tab and new line, in precisely that order. And don't leave
-# trailing blanks.
-space=' '
-tab=' '
-newline='
-'
-IFS="$space$tab$newline"
-
-# In case someone pedantic insists on using grep -E.
-: ${EGREP=egrep}
-
-# Systems which define $COMSPEC or $ComSpec use semicolons to separate
-# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
-# might be inherited, but : is used.
-if test -n "$COMSPEC$ComSpec" \
- && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then
- path_sep=";"
-else
- path_sep=":"
-fi
-
-# Pacify verbose cds.
-CDPATH=${ZSH_VERSION+.}$path_sep
-
-# If $TEX is set to a directory, don't use it.
-test -n "$TEX" && test -d "$TEX" && unset TEX
-
-#
-## --------------------- ##
-## Auxiliary functions. ##
-## --------------------- ##
-
-# In case `local' is not supported by the shell, provide a function
-# that simulates it by simply performing the assignments. This means
-# that we must not expect `local' to work, i.e., we must not (i) rely
-# on it during recursion, and (ii) have two local declarations of the
-# same variable. (ii) is easy to check statically, and our test suite
-# does make sure there is never twice a static local declaration of a
-# variable. (i) cannot be checked easily, so just be careful.
-#
-# Note that since we might use a function simulating `local', we can
-# no longer rely on the fact that no IFS-splitting is performed. So,
-# while
-#
-# foo=$bar
-#
-# is fine (no IFS-splitting), never write
-#
-# local foo=$bar
-#
-# but rather
-#
-# local foo="$bar"
-(
- foo=bar
- test_local () {
- local foo=foo
- }
- test_local
- test $foo = bar
-) || local () {
- case $1 in
- *=*) eval "$1";;
- esac
-}
-
-
-# cd_orig
-# -------
-# Return to the original directory.
-cd_orig ()
-{
- # In case $orig_pwd is on a different drive (for DOS).
- cd /
-
- # Return to the original directory so that
- # - the next file is processed in correct conditions
- # - the temporary file can be removed
- cd "$orig_pwd" || exit 1
-}
-
-# func_dirname FILE
-# -----------------
-# Return the directory part of FILE.
-func_dirname ()
-{
- dirname "$1" 2>/dev/null \
- || { echo "$1" | sed 's!/[^/]*$!!;s!^$!.!'; }
-}
-
-
-# noexit FILE
-# -----------
-# Return FILE with one extension remove. foo.bar.baz -> foo.bar.
-noext ()
-{
- echo "$1" | sed -e 's/\.[^/.][^/.]*$//'
-}
-
-
-# absolute NAME -> ABS-NAME
-# -------------------------
-# Return an absolute path to NAME.
-absolute ()
-{
- case $1 in
- [\\/]* | ?:[\\/]*)
- # Absolute paths don't need to be expanded.
- echo "$1"
- ;;
- *) local slashes
- slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
- local rel
- rel=$orig_pwd/`func_dirname "$1"`
- if test -d "$rel"; then
- (cd "$rel" 2>/dev/null &&
- local n
- n=`pwd`/`basename "$1"`"$slashes"
- echo "$n")
- else
- error 1 "not a directory: $rel"
- fi
- ;;
- esac
-}
-
-
-# ensure_dir DIR1 DIR2...
-# -----------------------
-# Make sure the directories exist.
-ensure_dir ()
-{
- for dir
- do
- # Beware that in parallel builds we may have several concurrent
- # attempts to create the directory. So fail only if "mkdir"
- # failed *and* the directory still does not exist.
- test -d "$dir" \
- || mkdir "$dir" \
- || test -d "$dir" \
- || error 1 "cannot create directory: $dir"
- done
-}
-
-
-# error EXIT_STATUS LINE1 LINE2...
-# --------------------------------
-# Report an error and exit with failure if EXIT_STATUS is non null.
-error ()
-{
- local s="$1"
- shift
- report "$@"
- if test "$s" != 0; then
- exit $s
- fi
-}
-
-
-# findprog PROG
-# -------------
-# Return true if PROG is somewhere in PATH, else false.
-findprog ()
-{
- local saveIFS="$IFS"
- IFS=$path_sep # break path components at the path separator
- for dir in $PATH; do
- IFS=$saveIFS
- # The basic test for an executable is `test -f $f && test -x $f'.
- # (`test -x' is not enough, because it can also be true for directories.)
- # We have to try this both for $1 and $1.exe.
- #
- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
- # also `test -f' has this enhancement, but not on DJGPP. (Both are
- # design decisions, so there is little chance to make them consistent.)
- # Thusly, it seems to be difficult to make use of these enhancements.
- #
- if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
- return 0
- fi
- done
- return 1
-}
-
-# report LINE1 LINE2...
-# ---------------------
-# Report some information on stderr.
-report ()
-{
- for i in "$@"
- do
- echo >&2 "$0: $i"
- done
-}
-
-
-# run COMMAND-LINE
-# ----------------
-# Run the COMMAND-LINE verbosely, and catching errors as failures.
-run ()
-{
- verbose "Running $@"
- "$@" 2>&5 1>&2 ||
- error 1 "$1 failed"
-}
-
-
-# usage
-# -----
-# Display usage and exit successfully.
-usage ()
-{
- # We used to simply have `echo "$usage"', but coping with the
- # changing behavior of `echo' is much harder than simply using a
- # here-doc.
- #
- # echo '\noto' echo '\\noto' echo -e '\\noto'
- # bash 3.1 \noto \\noto \noto
- # bash 3.2 %oto \noto -e \noto
- #
- # where % denotes the eol character.
- cat <<EOF
-Usage: $program [OPTION]... FILE...
- texi2pdf [OPTION]... FILE...
- pdftexi2dvi [OPTION]... FILE...
-
-Run each Texinfo or (La)TeX FILE through TeX in turn until all
-cross-references are resolved, building all indices. The directory
-containing each FILE is searched for included files. The suffix of FILE
-is used to determine its language ((La)TeX or Texinfo). To process
-(e)plain TeX files, set the environment variable LATEX=tex.
-
-In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX,
-the FILE may also be composed of the following simple TeX commands.
- \`\\input{FILE}' the actual file to compile
- \`\\nonstopmode' same as --batch
-
-When invoked as \`texi2pdf' or \`pdftexi2dvi', or given the option --pdf
-or --dvipdf, generate PDF output. Otherwise, generate DVI.
-
-General options:
- -b, --batch no interaction
- -D, --debug turn on shell debugging (set -x)
- -h, --help display this help and exit successfully
- -o, --output=OFILE leave output in OFILE (implies --clean);
- only one input FILE may be specified in this case
- -q, --quiet no output unless errors (implies --batch)
- -s, --silent same as --quiet
- -v, --version display version information and exit successfully
- -V, --verbose report on what is done
-
-TeX tuning:
- -@ use @input instead of \input for preloaded Texinfo
- -e, -E, --expand force macro expansion using makeinfo
- -I DIR search DIR for Texinfo files
- -l, --language=LANG specify LANG for FILE, either latex or texinfo
- --no-line-error do not pass --file-line-error to TeX
- -r, --recode call recode before TeX to translate input
- --recode-from=ENC recode from ENC to the @documentencoding
- --src-specials pass --src-specials to TeX
- -t, --command=CMD insert CMD in copy of input file
- or --texinfo=CMD multiple values accumulate
- --translate-file=FILE use given charset translation file for TeX
-
-Output format:
- --dvi output a DVI file [default]
- --dvipdf output a PDF file via DVI (using dvipdf)
- --html output an HTML file. Use HeVeA for LaTeX files
- --info output an Info file. Use HeVeA for LaTeX files
- -p, --pdf use pdftex or pdflatex for processing
- --ps output a PDF file via DVI (using dvips)
- --text output a plain text file. Use HeVeA for LaTeX files
-
-Build modes:
- --build=MODE specify the treatment of auxiliary files [$build_mode]
- --tidy same as --build=tidy
- -c, --clean same as --build=clean
- --build-dir=DIR specify where the tidy compilation is performed;
- implies --tidy;
- defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
- --mostly-clean remove the auxiliary files and directories
- but not the output
- --max-iterations=N don't process files more than N times
-
-The MODE specifies where the TeX compilation takes place, and, as a
-consequence, how auxiliary files are treated. The build mode
-can also be set using the environment variable TEXI2DVI_BUILD_MODE.
-
-Valid MODEs are:
- \`local' compile in the current directory, leaving all the auxiliary
- files around. This is the traditional TeX use.
- \`tidy' compile in a local *.t2d directory, where the auxiliary files
- are left. Output files are copied back to the original file.
- \`clean' same as \`tidy', but remove the auxiliary directory afterwards.
- Every compilation therefore requires the full cycle.
-
-Using the \`tidy' mode brings several advantages:
- - the current directory is not cluttered with plethora of temporary files.
- - clutter can be even further reduced using --build-dir=dir: all the *.t2d
- directories are stored there.
- - clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
- or --build-dir=\$HOME/.t2d.
- - the output file is updated after every succesful TeX run, for
- sake of concurrent visualization of the output. In a \`local' build
- the viewer stops during the whole TeX run.
- - if the compilation fails, the previous state of the output file
- is preserved.
- - PDF and DVI compilation are kept in separate subdirectories
- preventing any possibility of auxiliary file incompatibility.
-
-On the other hand, because \`tidy' compilation takes place in another
-directory, occasionally TeX won't be able to find some files (e.g., when
-using \\graphicspath): in that case use -I to specify the additional
-directories to consider.
-
-The values of the BIBTEX, DVIPDF, DVIPS, LATEX, MAKEINDEX, MAKEINFO,
-PDFLATEX, PDFTEX, TEX, TEXINDEX, and THUMBPDF environment variables are used
-to run those commands, if they are set. Any CMD strings are added after
-@setfilename for Texinfo input, in the first line for LaTeX input.
-
-Report bugs to bug-texinfo(a)gnu.org,
-general questions and discussion to help-texinfo(a)gnu.org.
-GNU Texinfo home page: <http://www.gnu.org/software/texinfo/>
-General help using GNU software: <http://www.gnu.org/gethelp/>
-EOF
- exit 0
-}
-
-
-# verbose WORD1 WORD2
-# -------------------
-# Report some verbose information.
-verbose ()
-{
- if $verb; then
- echo >&2 "$0: $@"
- fi
-}
-
-
-# version
-# -------
-# Display version info and exit succesfully.
-version ()
-{
- cat <<EOF
-texi2dvi (GNU Texinfo 4.13) $rcs_version
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-EOF
- exit 0
-}
-
-
-## ---------------- ##
-## Handling lists. ##
-## ---------------- ##
-
-
-# list_append LIST-NAME ELEM
-# --------------------------
-# Set LIST-NAME to its former contents, with ELEM appended.
-list_append ()
-{
- local la_l="$1"
- shift
- eval set X \$$la_l "$@"
- shift
- eval $la_l=\""$@"\"
-}
-
-
-# list_concat_dirs LIST-NAME DIR-LIST
-# -----------------------------------
-# Append to LIST-NAME all the components (included empty) from
-# the $path_sep separated list DIR-LIST. Make the paths absolute.
-list_concat_dirs ()
-{
- local lcd_list="$1"
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_EMPTY="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- save_IFS=$IFS
- IFS=$path_sep
- set x `echo "$2" | eval sed $replace_EMPTY`; shift
- IFS=$save_IFS
- local dir
- for dir
- do
- case $dir in
- EMPTY)
- list_append $lcd_list ""
- ;;
- *)
- if test -d $dir; then
- dir=`absolute "$dir"`
- list_append $lcd_list "$dir"
- fi
- ;;
- esac
- done
-}
-
-
-# list_prefix LIST-NAME SEP -> STRING
-# -----------------------------------
-# Return a string that is composed of the LIST-NAME with each item
-# preceded by SEP.
-list_prefix ()
-{
- local lp_p="$2"
- eval set X \$$1
- shift
- local lp_res
- for i
- do
- lp_res="$lp_res \"$lp_p\" \"$i\""
- done
- echo "$lp_res"
-}
-
-# list_infix LIST-NAME SEP -> STRING
-# ----------------------------------
-# Same as list_prefix, but a separator.
-list_infix ()
-{
- eval set X \$$1
- shift
- local la_IFS="$IFS"
- IFS=$path_sep
- echo "$*"
- IFS=$la_IFS
-}
-
-# list_dir_to_abs LIST-NAME
-# -------------------------
-# Convert the list to using only absolute dir names.
-# Currently unused, but should replace absolute_filenames some day.
-list_dir_to_abs ()
-{
- local ld_l="$1"
- eval set X \$$ld_l
- shift
- local ld_res
- for dir
- do
- dir=`absolute "$dir"`
- test -d "$dir" || continue
- ld_res="$ld_res \"$dir\""
- done
- set X $ld_res; shift
- eval $ld_l=\"$@\"
-}
-
-
-## ------------------------------ ##
-## Language auxiliary functions. ##
-## ------------------------------ ##
-
-
-# out_lang_set LANG
-# -----------------
-out_lang_set ()
-{
- case $1 in
- dvi|dvipdf|html|info|pdf|ps|text) out_lang=$1;;
- *) error 1 "invalid output format: $1";;
- esac
-}
-
-
-# out_lang_tex
-# ------------
-# Return the tex output language (DVI or PDF) for $OUT_LANG.
-out_lang_tex ()
-{
- case $out_lang in
- dvi | ps | dvipdf ) echo dvi;;
- pdf ) echo $out_lang;;
- html | info | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-# out_lang_ext
-# ------------
-# Return the extension for $OUT_LANG.
-out_lang_ext ()
-{
- case $out_lang in
- dvipdf ) echo pdf;;
- dvi | html | info | pdf | ps | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-## ------------------------- ##
-## TeX auxiliary functions. ##
-## ------------------------- ##
-
-# Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
-# Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
-TEXINPUTS TFMFONTS"
-for var in $tex_envvars; do
- eval ${var}_orig=\$$var
- export $var
-done
-
-
-# absolute_filenames TEX-PATH -> TEX-PATH
-# ---------------------------------------
-# Convert relative paths to absolute paths, so we can run in another
-# directory (e.g., in tidy build mode, or during the macro-support
-# detection). Prepend ".".
-absolute_filenames ()
-{
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- local res
- res=`echo "$1" | eval sed $replace_empty`
- save_IFS=$IFS
- IFS=$path_sep
- set x $res; shift
- res=.
- for dir
- do
- case $dir in
- EMPTY)
- res=$res$path_sep
- ;;
- *)
- if test -d "$dir"; then
- res=$res$path_sep`absolute "$dir"`
- else
- # Even if $dir is not a directory, preserve it in the path.
- # It might contain metacharacters that TeX will expand in
- # turn, e.g., /some/path/{a,b,c}. This will not get the
- # implicit absolutification of the path, but we can't help that.
- res=$res$path_sep$dir
- fi
- ;;
- esac
- done
- echo "$res"
-}
-
-
-# output_base_name FILE
-# ---------------------
-# The name of FILE, possibly renamed to satisfy --output.
-# FILE is local, there is no directory part.
-output_base_name ()
-{
- case $oname in
- '') echo "$1";;
- *) local out_noext
- out_noext=`noext "$oname"`
- local file_ext
- file_ext=`echo "$1" | sed 's/^.*\.//'`
- echo "$out_noext.$file_ext"
- ;;
- esac
-}
-
-
-# destdir
-# -------
-# Return the name of the directory where the output is expected.
-destdir ()
-{
- case $oname in
- '') echo "$orig_pwd";;
- *) dirname "$oname";;
- esac
-}
-
-
-# move_to_dest FILE...
-# --------------------
-# Move FILE to the place where the user expects it. Truly move it, that
-# is, it must not remain in its build location unless that is also the
-# output location. (Otherwise it might appear as an extra file in make
-# distcheck.)
-#
-# FILE can be the principal output (in which case -o directly applies), or
-# an auxiliary file with the same base name.
-move_to_dest ()
-{
- # If we built in place, there is nothing to install, leave.
- case $tidy:$oname in
- false:) return;;
- esac
-
- local destfile
- local destdir
- local destbase
- local sourcedir
- local sourcebase
-
- for file
- do
- test -f "$file" ||
- error 1 "no such file or directory: $file"
- case $tidy:$oname in
- true:) destdir=$orig_pwd
- destfile=$destdir/$file;;
- *:*) destfile=`output_base_name "$file"`
- destdir=`dirname "$destfile"`;;
- esac
- # We want to compare the source location and the output location,
- # and if they are different, do the move. But if they are the
- # same, we must preserve the source. Since we can't assume
- # stat(1) or test -ef is available, resort to comparing the
- # directory names, canonicalized with pwd. We can't use cmp -s
- # since the output file might not actually change from run to run;
- # e.g., TeX DVI output is timestamped to only the nearest minute.
- destdir=`cd "$destdir" && pwd`
- destbase=`basename "$destfile"`
-
- sourcedir=`dirname "$file"`
- sourcedir=`cd "$sourcedir" && pwd`
- sourcebase=`basename "$file"`
-
- if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
- verbose "Moving $file to $destfile"
- rm -f "$destfile"
- mv "$file" "$destfile"
- fi
- done
-}
-
-
-## --------------------- ##
-## Managing xref files. ##
-## --------------------- ##
-
-# aux_file_p FILE
-# ---------------
-# Return with success if FILE is an aux file.
-aux_file_p ()
-{
- test -f "$1" || return 1
- case $1 in
- *.aux) return 0;;
- *) return 1;;
- esac
-}
-
-# bibaux_file_p FILE
-# ------------------
-# Return with success if FILE is an aux file containing citation
-# requests.
-bibaux_file_p ()
-{
- test -s "$1" || return 1
- if (grep '^\\bibstyle[{]' "$1" \
- && grep '^\\bibdata[{]' "$1" \
- ## The following line is suspicious: fails when there
- ## are citations in sub aux files. We need to be
- ## smarter in this case.
- ## && grep '^\\citation[{]' "$f"
- ) >&6 2>&1;
- then
- return 0
- fi
- return 1
-}
-
-# index_file_p FILE
-# -----------------
-# Return with success if FILE is an index file.
-index_file_p ()
-{
- test -f "$1" || return 1
- case $in_lang:$latex2html:`out_lang_tex`:`sed '1q' "$1"` in
- # When working with TeX4HT, *.idx are created by LaTeX. They must
- # be processed to produce *.4ix, *.4dx files. The *.4dx file is
- # passed to makeindex to produce the *.ind file. This sequence is
- # handled by run_index, so we are only interested in the *.idx
- # files, which have each "\indexentry" preceded by a
- # "\beforeentry".
- latex:tex4ht:html:"\\beforeentry {"*) return 0;;
-
- # When index.sty is used, there is a space before the brace.
- latex:*:*:"\\indexentry{"*|latex:*:*:"\\indexentry {"*) return 0;;
-
- texinfo:*:*:"\\entry{"*) return 0;;
-
- *) return 1;;
- esac
-}
-
-# xref_file_p FILE
-# ----------------
-# Return with success if FILE is an xref file (indexes, tables and lists).
-xref_file_p ()
-{
- test -f "$1" || return 1
- # If the file is not suitable to be an index or xref file, don't
- # process it. It's suitable if the first character is a
- # backslash or right quote or at, as long as the first line isn't
- # \input texinfo.
- case `sed '1q' "$1"` in
- "\\input texinfo"*) return 1;;
- [\\''@]*) return 0;;
- *) return 1;;
- esac
-}
-
-
-# generated_files_get FILENAME-NOEXT [PREDICATE-FILTER]
-# -----------------------------------------------------
-# Return the list of files generated by the TeX compilation of FILENAME-NOEXT.
-generated_files_get ()
-{
- local filter=true
- if test -n "$2"; then
- filter=$2
- fi
-
- # Gather the files created by TeX.
- (
- if test -f "$1.log"; then
- sed -n -e "s,^\\\\openout.* = \`\\(.*\\)'\\.,\\1,p" "$1.log"
- fi
- echo "$1.log"
- ) |
- # Depending on these files, infer outputs from other tools.
- while read file; do
- echo $file
- case $in_lang in
- texinfo)
- # texindex: texinfo.cp -> texinfo.cps
- if index_file_p $file; then
- echo ${file}s
- fi
- ;;
- latex)
- if aux_file_p $file; then
- # bibtex: *.aux -> *.bbl and *.blg.
- echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
- echo $file | sed 's/^\(.*\)\.aux$/\1.blg/'
- # -recorder: .fls
- echo $file | sed 's/^\(.*\)\.aux$/\1.fls/'
- fi
- ;;
- esac
- done |
- # Filter existing files matching the criterion.
- #
- # With an input file name containing a space, this produces a
- # "command not found" message (and filtering is ineffective).
- # The situation with a newline is presumably even worse.
- while read file; do
- if $filter "$file"; then
- echo $file
- fi
- done |
- sort |
- # Some files are opened several times, e.g., listings.sty's *.vrb.
- uniq
-}
-
-
-# xref_files_save
-# ---------------
-# Save the xref files.
-xref_files_save ()
-{
- # Save copies of auxiliary files for later comparison.
- xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
- if test -n "$xref_files_orig"; then
- verbose "Backing up xref files: $xref_files_orig"
- # The following line improves `cp $xref_files_orig "$work_bak"'
- # by preserving the directory parts. Think of
- # cp chap1/main.aux chap2/main.aux $work_bak.
- #
- # Users may have, e.g., --keep-old-files. Don't let this interfere.
- # (Don't use unset for the sake of ancient shells.)
- TAR_OPTIONS=; export TAR_OPTIONS
- tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
- fi
-}
-
-
-# xref_files_changed
-# ------------------
-# Whether the xref files were changed since the previous run.
-xref_files_changed ()
-{
- # LaTeX (and the package changebar) report in the LOG file if it
- # should be rerun. This is needed for files included from
- # subdirs, since texi2dvi does not try to compare xref files in
- # subdirs. Performing xref files test is still good since LaTeX
- # does not report changes in xref files.
- if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then
- return 0
- fi
-
- # If old and new lists don't at least have the same file list,
- # then one file or another has definitely changed.
- xref_files_new=`generated_files_get "$in_noext" xref_file_p`
- verbose "Original xref files = $xref_files_orig"
- verbose "New xref files = $xref_files_new"
- if test "x$xref_files_orig" != "x$xref_files_new"; then
- return 0
- fi
-
- # Compare each file until we find a difference.
- for this_file in $xref_files_new; do
- verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
- # cmp -s returns nonzero exit status if files differ.
- if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
- verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
- if $debug; then
- diff -u "$work_bak/$this_file" "$this_file"
- fi
- return 0
- fi
- done
-
- # No change.
- return 1
-}
-
-
-
-## ----------------------- ##
-## Running the TeX suite. ##
-## ----------------------- ##
-
-
-
-# run_tex ()
-# ----------
-# Run TeX as "$tex $in_input", taking care of errors and logs.
-run_tex ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:*:dvi|latex:tex4ht:html)
- tex=${LATEX:-latex};;
- latex:*:pdf)
- tex=${PDFLATEX:-pdflatex};;
- texinfo:*:dvi)
- # MetaPost also uses the TEX environment variable. If the user
- # has set TEX=latex for that reason, don't bomb out.
- case $TEX in
- *latex) tex=tex;; # don't bother trying to find etex
- *) tex=$TEX
- esac;;
- texinfo:*:pdf) tex=$PDFTEX;;
-
- *) error 1 "$out_lang not supported for $in_lang";;
- esac
-
- # do the special catcode trick for ~ in filenames only for Texinfo,
- # not LaTeX.
- if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
- catcode_special=true
- else
- catcode_special=false
- fi
-
- # Beware of aux files in subdirectories that require the
- # subdirectory to exist.
- case $in_lang:$tidy in
- latex:true)
- sed -n 's|^[ ]*\\include{\(.*\)/.*}.*|\1|p' "$in_input" |
- sort -u |
- while read d
- do
- ensure_dir "$work_build/$d"
- done
- ;;
- esac
-
- # Note that this will be used via an eval: quote properly.
- local cmd="$tex"
-
- # If possible, make TeX report error locations in GNU format.
- if $line_error; then
- if test "${tex_help:+set}" != set; then
- # Go to a temporary directory to try --help, since old versions that
- # don't accept --help will generate a texput.log.
- tex_help_dir=$t2ddir/tex_help
- ensure_dir "$tex_help_dir"
- tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1 || true`
- fi
- # The mk program and perhaps others want to parse TeX's
- # original error messages.
- case $tex_help in
- *file-line-error*) cmd="$cmd --file-line-error";;
- esac
- fi
-
- # Tell TeX about TCX file, if specified.
- test -n "$translate_file" && cmd="$cmd --translate-file=$translate_file"
-
- # Tell TeX to make source specials (for backtracking from output to
- # source, given a sufficiently smart editor), if specified.
- test -n "$src_specials" && cmd="$cmd $src_specials"
-
- # Tell TeX to be batch if requested.
- if $batch; then
- # \batchmode does not show terminal output at all, so we don't
- # want that. And even in batch mode, TeX insists on having input
- # from the user. Close its stdin to make it impossible.
- cmd="$cmd </dev/null '${escape}nonstopmode'"
- fi
-
- # we'd like to handle arbitrary input file names, especially
- # foo~bar/a~b.tex, since Debian likes ~ characters.
- if $catcode_special; then
- # $normaltilde is just to reduce line length in this source file.
- # The idea is to define \normaltilde as a catcode other ~ character,
- # then make the active ~ be equivalent to that, instead of the plain
- # TeX tie. Then when the active ~ appears in the filename, it will
- # be expanded to itself, as far as \input will see. (This is the
- # same thing that texinfo.tex does in general, BTW.)
- normaltilde="${escape}catcode126=12 ${escape}def${escape}normaltilde{~}"
- cmd="$cmd '$normaltilde${escape}catcode126=13 ${escape}let~\normaltilde '"
- fi
- # Other special (non-active) characters could be supported by
- # resetting their catcodes to other on the command line and changing
- # texinfo.tex to initialize everything to plain catcodes. Maybe someday.
-
- # append the \input command.
- cmd="$cmd '${escape}input'"
-
- # TeX's \input does not (easily or reliably) support whitespace
- # characters or other special characters in file names. Our intensive
- # use of absolute file names makes this worse: the enclosing directory
- # names may include white spaces. Improve the situation using a
- # symbolic link to the filename in the current directory, in tidy mode
- # only. Do not alter in_input.
- #
- # The filename is almost always tokenized using plain TeX conventions
- # (the exception would be if the user made a texinfo.fmt file). Not
- # all the plain TeX special characters cause trouble, but there's no
- # harm in making the link.
- #
- case $tidy:`func_dirname "$in_input"` in
- true:*["$space$tab$newline\"#\$%\\^_{}~"]*)
- _run_tex_file_name=`basename "$in_input"`
- if test ! -f "$_run_tex_file_name"; then
- # It might not be a file, clear it.
- run rm -f "$_run_tex_file_name"
- run ln -s "$in_input"
- fi
- cmd="$cmd '$_run_tex_file_name'"
- ;;
-
- *)
- cmd="$cmd '$in_input'"
- ;;
- esac
-
- verbose "$0: Running $cmd ..."
- if eval "$cmd" >&5; then
- case $out_lang in
- dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
- esac
- else
- error 1 "$tex exited with bad status, quitting."
- fi
-}
-
-# run_bibtex ()
-# -------------
-# Run bibtex on current file.
-# - If its input (AUX) exists.
-# - If some citations are missing (LOG contains `Citation').
-# or the LOG complains of a missing .bbl
-#
-# Don't try to be too smart:
-#
-# 1. Running bibtex only if the bbl file exists and is older than
-# the LaTeX file is wrong, since the document might include files
-# that have changed.
-#
-# 3. Because there can be several AUX (if there are \include's),
-# but a single LOG, looking for missing citations in LOG is
-# easier, though we take the risk to match false messages.
-run_bibtex ()
-{
- case $in_lang in
- latex) bibtex=${BIBTEX:-bibtex};;
- texinfo) return;;
- esac
-
- # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
- # The no .aux && \bibdata test is also for btxmac, in case it was the
- # first run of a bibtex-using document. Otherwise, it's possible that
- # bibtex would never be run.
- if test -r "$in_noext.aux" \
- && test -r "$in_noext.log" \
- && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
- || grep '.*Undefined citation' "$in_noext.log" \
- || grep 'No file .*\.bbl\.' "$in_noext.log") \
- || (grep 'No \.aux file' "$in_noext.log" \
- && grep '^\\bibdata' "$in_noext.aux")) \
- >&6 2>&1; \
- then
- for f in `generated_files_get "$in_noext" bibaux_file_p`
- do
- run $bibtex "$f"
- done
- fi
-}
-
-# run_index ()
-# ------------
-# Run texindex (or makeindex or texindy) on current index files. If
-# they already exist, and after running TeX a first time the index
-# files don't change, then there's no reason to run TeX again. But we
-# won't know that if the index files are out of date or nonexistent.
-run_index ()
-{
- local index_files=`generated_files_get $in_noext index_file_p`
- test -n "$index_files" ||
- return 0
-
- : ${MAKEINDEX:=makeindex}
- : ${TEXINDEX:=texindex}
- : ${TEXINDY:=texindy}
-
- local index_file
- local index_noext
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- for index_file in $index_files
- do
- index_noext=`noext "$index_file"`
- run tex \
- '\def\filename{{'"$index_noext"'}{idx}{4dx}{ind}}
- \input idxmake.4ht'
- run $MAKEINDEX -o $index_noext.ind $index_noext.4dx
- done
- ;;
-
- latex:*)
- if $TEXINDY --version >&6 2>&1; then
- run $TEXINDY $index_files
- else
- run $MAKEINDEX $index_files
- fi
- ;;
-
- texinfo:*)
- run $TEXINDEX $index_files
- ;;
- esac
-}
-
-
-# run_tex4ht ()
-# -------------
-# Run the last two phases of TeX4HT: tex4ht extracts the HTML from the
-# instrumented DVI file, and t4ht converts the figures and installs
-# the files when given -d.
-#
-# Because knowing exactly which files are created is complex (in
-# addition the names are not simple to compute), which makes it
-# difficult to install the output files in a second step, it is much
-# simpler to install directly the output files.
-run_tex4ht ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- : ${TEX4HT=tex4ht} ${T4HT=t4ht}
- run "$TEX4HT" "-f/$in_noext"
- # Do not remove the / after the destdir.
- run "$T4HT" "-d`destdir`/" "-f/$in_noext"
- ;;
- esac
-}
-
-
-# run_thumbpdf ()
-# ---------------
-run_thumbpdf ()
-{
- if test `out_lang_tex` = pdf \
- && test -r "$in_noext.log" \
- && grep 'thumbpdf\.sty' "$in_noext.log" >&6 2>&1; \
- then
- thumbpdf=${THUMBPDF:-thumbpdf}
- thumbcmd="$thumbpdf $in_dir/$in_noext"
- verbose "Running $thumbcmd ..."
- if $thumbcmd >&5; then
- run_tex
- else
- report "$thumbpdf exited with bad status." \
- "Ignoring its output."
- fi
- fi
-}
-
-
-# run_dvipdf FILE.dvi
-# -------------------
-# Convert FILE.dvi to FILE.pdf.
-run_dvipdf ()
-{
- # Find which dvi->pdf program is available.
- if test -z "$dvipdf"; then
- for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf;
- do
- if findprog $i; then
- dvipdf=$i
- fi
- done
- fi
- # These tools have varying interfaces, some 'input output', others
- # 'input -o output'. They all seem to accept 'input' only,
- # outputting using the expected file name.
- run $dvipdf "$1"
- if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
- error 1 "cannot find output file"
- fi
-}
-
-# run_tex_suite ()
-# ----------------
-# Run the TeX tools until a fix point is reached.
-run_tex_suite ()
-{
- # Move to the working directory.
- if $tidy; then
- verbose "cd $work_build"
- cd "$work_build" || exit 1
- fi
-
- # Count the number of cycles.
- local cycle=0
-
- while :; do
- # check for probably LaTeX loop (e.g. varioref)
- if test $cycle -eq "$max_iters"; then
- error 0 "Maximum of $max_iters cycles exceeded"
- break
- fi
-
- # report progress
- cycle=`expr $cycle + 1`
- verbose "Cycle $cycle for $command_line_filename"
-
- xref_files_save
-
- # We run bibtex first, because I can see reasons for the indexes
- # to change after bibtex is run, but I see no reason for the
- # converse.
- run_bibtex
- run_index
- run_core_conversion
-
- xref_files_changed || break
- done
-
- # If we were using thumbpdf and producing PDF, then run thumbpdf
- # and TeX one last time.
- run_thumbpdf
-
- # If we are using tex4ht, call it.
- run_tex4ht
-
- # Install the result if we didn't already (i.e., if the output is
- # dvipdf or ps).
- case $latex2html:$out_lang in
- *:dvipdf)
- run_dvipdf "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- *:ps)
- : {DVIPS=dvips}
- $DVIPS -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- esac
-
- cd_orig
-}
-
-## -------------------------------- ##
-## TeX processing auxiliary tools. ##
-## -------------------------------- ##
-
-
-# A sed script that preprocesses Texinfo sources in order to keep the
-# iftex sections only. We want to remove non TeX sections, and comment
-# (with `@c _texi2dvi') TeX sections so that makeinfo does not try to
-# parse them. Nevertheless, while commenting TeX sections, don't
-# comment @macro/@end macro so that makeinfo does propagate them.
-# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
-# (yet), makeinfo can't parse the TeX commands, so work around with sed.
-#
-# We assume that `@c _texi2dvi' starting a line is not present in the
-# document.
-#
-comment_iftex=\
-'/^@tex/,/^@end tex/{
- s/^/@c _texi2dvi/
-}
-/^@iftex/,/^@end iftex/{
- s/^/@c _texi2dvi/
- /^@c _texi2dvi@macro/,/^@c _texi2dvi@end macro/{
- s/^@c _texi2dvi//
- }
-}
-/^@ifnottex/,/^@end ifnottex/{
- s/^/@c (_texi2dvi)/
-}
-/^@ifinfo/,/^@end ifinfo/{
- /^@node/p
- /^@menu/,/^@end menu/p
- t
- s/^/@c (_texi2dvi)/
-}
-s/^@ifnotinfo/@c _texi2dvi@ifnotinfo/
-s/^@end ifnotinfo/@c _texi2dvi@end ifnotinfo/'
-
-# Uncommenting is simpler: remove any leading `@c texi2dvi'; repeated
-# copies can sneak in via macro invocations.
-uncomment_iftex='s/^@c _texi2dvi\(@c _texi2dvi\)*//'
-
-
-# run_makeinfo ()
-# ---------------
-# Expand macro commands in the original source file using Makeinfo.
-# Always use `end' footnote style, since the `separate' style
-# generates different output (arguably this is a bug in -E). Discard
-# main info output, the user asked to run TeX, not makeinfo.
-run_makeinfo ()
-{
- test $in_lang = texinfo \
- || return 0
-
- # Unless required by the user, makeinfo expansion is wanted only
- # if texinfo.tex is too old.
- if $expand; then
- makeinfo=${MAKEINFO:-makeinfo}
- else
- # Check if texinfo.tex performs macro expansion by looking for
- # its version. The version is a date of the form YEAR-MO-DA.
- # We don't need to use [0-9] to match the digits since anyway
- # the comparison with $txiprereq, a number, will fail with non
- # digits.
- # Run in a temporary directory to avoid leaving files.
- version_test_dir=$t2ddir/version_test
- ensure_dir "$version_test_dir"
- (
- cd "$version_test_dir"
- echo '\input texinfo.tex @bye' >txiversion.tex
- # Be sure that if tex wants to fail, it is not interactive:
- # close stdin.
- $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
- )
- if test $? != 0; then
- cat "$version_test_dir/txiversion.out"
- cat "$version_test_dir/txiversion.err" >&2
- error 1 "texinfo.tex appears to be broken, quitting."
- fi
- eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
- verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
- if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
- makeinfo=
- else
- makeinfo=${MAKEINFO:-makeinfo}
- fi
- # If TeX is preloaded, offer the user this convenience:
- if test "$txiformat" = Texinfo; then
- escape=@
- fi
- fi
-
- if test -n "$makeinfo"; then
- # in_src: the file with macros expanded.
- # Use the same basename to generate the same aux file names.
- work_src=$workdir/src
- ensure_dir "$work_src"
- in_src=$work_src/$in_base
- local miincludes
- miincludes=`list_prefix includes -I`
- verbose "Macro-expanding $command_line_filename to $in_src ..."
- # eval $makeinfo because it might be defined as something complex
- # (running missing) and then we end up with things like '"-I"',
- # and "-I" (including the quotes) is not an option name. This
- # happens with gettext 0.14.5, at least.
- sed "$comment_iftex" "$command_line_filename" \
- | eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
- -o /dev/null --macro-expand=- \
- | sed "$uncomment_iftex" >"$in_src"
- # Continue only if everything succeeded.
- if test $? -ne 0 \
- || test ! -r "$in_src"; then
- verbose "Expansion failed, ignored...";
- else
- in_input=$in_src
- fi
- fi
-}
-
-# insert_commands ()
-# ------------------
-# Used most commonly for @finalout, @smallbook, etc.
-insert_commands ()
-{
- if test -n "$textra"; then
- # _xtr. The file with the user's extra commands.
- work_xtr=$workdir/xtr
- in_xtr=$work_xtr/$in_base
- ensure_dir "$work_xtr"
- verbose "Inserting extra commands: $textra"
- local textra_cmd
- case $in_lang in
- latex) textra_cmd=1i;;
- texinfo) textra_cmd='/^@setfilename/a';;
- *) error 1 "internal error, unknown language: $in_lang";;
- esac
- sed "$textra_cmd\\
-$textra" "$in_input" >"$in_xtr"
- in_input=$in_xtr
- fi
-
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- # _tex4ht. The file with the added \usepackage{tex4ht}.
- work_tex4ht=$workdir/tex4ht
- in_tex4ht=$work_tex4ht/$in_base
- ensure_dir "$work_tex4ht"
- verbose "Inserting \\usepackage{tex4ht}"
- perl -pe 's<\\documentclass(?:\[.*\])?{.*}>
- <$&\\usepackage[xhtml]{tex4ht}>' \
- "$in_input" >"$in_tex4ht"
- in_input=$in_tex4ht
- ;;
- esac
-}
-
-# run_recode ()
-# -------------
-# If this is a Texinfo file with a specified input encoding, and
-# recode is available, then recode to plain 7 bit Texinfo.
-run_recode ()
-{
- local from
- local to
-
- if test $in_lang = texinfo; then
- pgm='s/^ *@documentencoding *\([^ ][^ ]*\) *$/\1/
- t found
- d
- :found
- q'
- encoding=`sed -e "$pgm" "$in_input"`
- if $recode && test -n "$encoding" && findprog recode; then
- if test -n "$recode_from"; then
- from=$recode_from
- to=$encoding
- else
- from=$encoding
- to=$texinfo
- fi
- verbose "Recoding from $from to $to."
- # _rcd. The Texinfo file recoded in 7bit.
- work_rcd=$workdir/recode
- in_rcd=$work_rcd/$in_base
- ensure_dir "$work_rcd"
- if recode "$encoding..$to" <"$in_input" >"$in_rcd" \
- && test -s "$in_rcd"; then
- in_input=$in_rcd
- else
- verbose "Recoding failed, using original input."
- fi
- fi
- fi
-}
-
-# compute_language FILENAME
-# -------------------------
-# Return the short string describing the language in which FILENAME
-# is written: `texinfo' or `latex'.
-compute_language ()
-{
- # If the user explicitly specified the language, use that.
- # Otherwise, if the first line is \input texinfo, assume it's texinfo.
- # Otherwise, guess from the file extension.
- if test -n "$set_language"; then
- echo $set_language
- elif sed 1q "$1" | grep 'input texinfo' >&6; then
- echo texinfo
- else
- # Get the type of the file (latex or texinfo) from the given language
- # we just guessed, or from the file extension if not set yet.
- case $1 in
- *.ltx | *.tex | *.drv | *.dtx) echo latex;;
- *) echo texinfo;;
- esac
- fi
-}
-
-
-# run_hevea (MODE)
-# ----------------
-# Convert to HTML/INFO/TEXT.
-#
-# Don't pass `-noiso' to hevea: it's useless in HTML since anyway the
-# charset is set to latin1, and troublesome in other modes since
-# accented characters loose their accents.
-#
-# Don't pass `-o DEST' to hevea because in that case it leaves all its
-# auxiliary files there too... Too bad, because it means we will need
-# to handle images some day.
-run_hevea ()
-{
- local hevea="${HEVEA:-hevea}"
- local run_hevea="$hevea"
-
- case $1 in
- html) ;;
- text|info) run_hevea="$run_hevea -$1";;
- *) error 1 "run_hevea: invalid argument: $1";;
- esac
-
- # Compiling to the tmp directory enables to preserve a previous
- # successful compilation.
- run_hevea="$run_hevea -fix -O -o '$out_base'"
- run_hevea="$run_hevea `list_prefix includes -I` -I '$orig_pwd' "
- run_hevea="$run_hevea '$in_input'"
-
- if $debug; then
- run_hevea="$run_hevea -v -v"
- fi
-
- verbose "running $run_hevea"
- if eval "$run_hevea" >&5; then
- # hevea leaves trailing white spaces, this is annoying.
- case $1 in text|info)
- perl -pi -e 's/[ \t]+$//g' "$out_base"*;;
- esac
- case $1 in
- html|text) move_to_dest "$out_base";;
- info) # There can be foo.info-1, foo.info-2 etc.
- move_to_dest "$out_base"*;;
- esac
- else
- error 1 "$hevea exited with bad status, quitting."
- fi
-}
-
-
-# run_core_conversion ()
-# ----------------------
-# Run the TeX (or HeVeA).
-run_core_conversion ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- *:dvi|*:pdf|latex:tex4ht:html)
- run_tex;;
- latex:*:html|latex:*:text|latex:*:info)
- run_hevea $out_lang;;
- *)
- error 1 "invalid input/output combination: $in_lang/$out_lang";;
- esac
-}
-
-
-# compile ()
-# ----------
-# Run the full compilation chain, from pre-processing to installation
-# of the output at its expected location.
-compile ()
-{
- # Source file might include additional sources.
- # We want `.:$orig_pwd' before anything else. (We'll add `.:' later
- # after all other directories have been turned into absolute paths.)
- # `.' goes first to ensure that any old .aux, .cps,
- # etc. files in ${directory} don't get used in preference to fresher
- # files in `.'. Include orig_pwd in case we are in clean build mode, where
- # we have cd'd to a temp directory.
- common="$orig_pwd$path_sep$in_dir$path_sep"
- #
- # If we have any includes, put those at the end.
- # Keep a final path_sep to get the default (system) TeX directories included.
- txincludes=`list_infix includes $path_sep`
- test -n "$txincludes" && common="$common$txincludes$path_sep"
- #
- for var in $tex_envvars; do
- eval val="\$common\$${var}_orig"
- # Convert relative paths to absolute paths, so we can run in another
- # directory (e.g., in clean build mode, or during the macro-support
- # detection). ".:" is added here.
- val=`absolute_filenames "$val"`
- eval $var="\"$val\""
- export $var
- eval verbose \"$var=\'\$${var}\'\"
- done
-
- # --expand
- run_makeinfo
-
- # --command, --texinfo
- insert_commands
-
- # --recode
- run_recode
-
- # Run until a fix point is reached.
- run_tex_suite
-}
-
-
-# remove FILES
-# ------------
-remove ()
-{
- verbose "Removing" "$@"
- rm -rf "$@"
-}
-
-
-# mostly_clean
-# ------------
-# Remove auxiliary files and directories. Changes the current directory.
-mostly_clean ()
-{
- cd_orig
- set X "$t2ddir"
- shift
- $tidy || {
- local log="$work_build/$in_noext.log"
- set X ${1+"$@"} "$log" `generated_files_get "$work_build/$in_noext"`
- shift
- }
- remove ${1+"$@"}
-}
-
-
-# cleanup ()
-# ----------
-# Remove what should be removed according to options.
-# Called at the end of each compilation cycle, and at the end of
-# the script. Changes the current directory.
-cleanup ()
-{
- case $build_mode in
- local) cd_orig; remove "$t2ddir";;
- clean) mostly_clean;;
- tidy) ;;
- esac
-}
-
-
-
-## ---------------------- ##
-## Command line parsing. ##
-## ---------------------- ##
-
-# Push a token among the arguments that will be used to notice when we
-# ended options/arguments parsing.
-# Use "set dummy ...; shift" rather than 'set - ..." because on
-# Solaris set - turns off set -x (but keeps set -e).
-# Use ${1+"$@"} rather than "$@" because Digital Unix and Ultrix 4.3
-# still expand "$@" to a single argument (the empty string) rather
-# than nothing at all.
-arg_sep="$$--$$"
-set dummy ${1+"$@"} "$arg_sep"; shift
-
-#
-# Parse command line arguments.
-while test x"$1" != x"$arg_sep"; do
-
- # Handle --option=value by splitting apart and putting back on argv.
- case "$1" in
- --*=*)
- opt=`echo "$1" | sed -e 's/=.*//'`
- val=`echo "$1" | sed -e 's/[^=]*=//'`
- shift
- set dummy "$opt" "$val" ${1+"$@"}; shift
- ;;
- esac
-
- # This recognizes --quark as --quiet. Oh well.
- case "$1" in
- -@ ) escape=@;;
- -~ ) catcode_special=false;;
- # Silently and without documentation accept -b and --b[atch] as synonyms.
- -b | --batch) batch=true;;
- --build) shift; build_mode=$1;;
- --build-dir) shift; build_dir=$1; build_mode=tidy;;
- -c | --clean) build_mode=clean;;
- -D | --debug) debug=true;;
- -e | -E | --expand) expand=true;;
- -h | --help) usage;;
- -I) shift; list_concat_dirs includes "$1";;
- -l | --lang | --language) shift; set_language=$1;;
- --mostly-clean) action=mostly-clean;;
- --no-line-error) line_error=false;;
- --max-iterations) shift; max_iters=$1;;
- -o | --out | --output)
- shift
- # Make it absolute, just in case we also have --clean, or whatever.
- oname=`absolute "$1"`;;
-
- # Output formats.
- -O|--output-format) shift; out_lang_set "$1";;
- --dvi|--dvipdf|--html|--info|--pdf|--ps|--text)
- out_lang_set `echo "x$1" | sed 's/^x--//'`;;
-
- -p) out_lang_set pdf;;
- -q | -s | --quiet | --silent) quiet=true; batch=true;;
- -r | --recode) recode=true;;
- --recode-from) shift; recode=true; recode_from="$1";;
- --src-specials) src_specials=--src-specials;;
- --tex4ht) latex2html=tex4ht;;
- -t | --texinfo | --command ) shift; textra="$textra\\
-"`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
- --translate-file ) shift; translate_file="$1";;
- --tidy) build_mode=tidy;;
- -v | --vers*) version;;
- -V | --verb*) verb=true;;
- --) # What remains are not options.
- shift
- while test x"$1" != x"$arg_sep"; do
- set dummy ${1+"$@"} "$1"; shift
- shift
- done
- break;;
- -*)
- error 1 "Unknown or ambiguous option \`$1'." \
- "Try \`--help' for more information."
- ;;
- *) set dummy ${1+"$@"} "$1"; shift;;
- esac
- shift
-done
-# Pop the token
-shift
-
-# $tidy: compile in a t2d directory.
-# $clean: remove all the aux files.
-case $build_mode in
- local) clean=false; tidy=false;;
- tidy) clean=false; tidy=true;;
- clean) clean=true; tidy=true;;
- *) error 1 "invalid build mode: $build_mode";;
-esac
-
-# Interpret remaining command line args as filenames.
-case $# in
- 0)
- error 2 "Missing file arguments." "Try \`--help' for more information."
- ;;
- 1) ;;
- *)
- if test -n "$oname"; then
- error 2 "Can't use option \`--output' with more than one argument."
- fi
- ;;
-esac
-
-
-# We can't do much without tex.
-#
-if findprog ${TEX:-tex}; then :; else cat <<EOM
-You don't have a working TeX binary (${TEX:-tex}) installed anywhere in
-your PATH, and texi2dvi cannot proceed without one. If you want to use
-this script, you'll need to install TeX (if you don't have it) or change
-your PATH or TEX environment variable (if you do). See the --help
-output for more details.
-
-For information about obtaining TeX, please see http://www.tug.org. If
-you happen to be using Debian, you can get it with this command:
- apt-get install tetex-bin
-EOM
- exit 1
-fi
-
-
-# We want to use etex (or pdftex) if they are available, and the user
-# didn't explicitly specify. We don't check for elatex and pdfelatex
-# because (as of 2003), the LaTeX team has asked that new distributions
-# use etex by default anyway.
-#
-# End up with the TEX and PDFTEX variables set to what we are going to use.
-if test -z "$TEX"; then
- if findprog etex; then TEX=etex; else TEX=tex; fi
-fi
-#
-if test -z "$PDFTEX"; then
- if findprog pdfetex; then PDFTEX=pdfetex; else PDFTEX=pdftex; fi
-fi
-
-
-# File descriptor usage:
-# 0 standard input
-# 1 standard output (--verbose messages)
-# 2 standard error
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 tools output (turned off by --quiet)
-# 6 tracing/debugging (set -x output, etc.)
-
-
-# Main tools' output (TeX, etc.) that TeX users are used to seeing.
-#
-# If quiet, discard, else redirect to the message flow.
-if $quiet; then
- exec 5>/dev/null
-else
- exec 5>&1
-fi
-
-
-# Enable tracing, and auxiliary tools output.
-#
-# Should be used where you'd typically use /dev/null to throw output
-# away. But sometimes it is convenient to see that output (e.g., from
-# a grep) to aid debugging. Especially debugging at distance, via the
-# user.
-if $debug; then
- exec 6>&1
- set -x
-else
- exec 6>/dev/null
-fi
-
-#
-
-# input_file_name_decode
-# ----------------------
-# Decode COMMAND_LINE_FILENAME, and compute:
-# - COMMAND_LINE_FILENAME clean of TeX commands
-# - IN_DIR
-# The directory to the input file, possibly absolute if needed.
-# - IN_DIR_ABS
-# The absolute directory of the input file.
-# - IN_BASE
-# The input file base name (no directory part).
-# - IN_NOEXT
-# The input file name without extensions (nor directory part).
-# - IN_INPUT
-# Defaults to COMMAND_LINE_FILENAME, but might change if the
-# input is preprocessed (recode etc.). With directory, possibly absolute.
-input_file_name_decode ()
-{
- # See if we are run from within AUC-Tex, in which case we are
- # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
- case $command_line_filename in
- *\\nonstopmode*)
- batch=true;;
- esac
- case $command_line_filename in
- *\\input{*}*)
- # Let AUC-TeX error parser deal with line numbers.
- line_error=false
- command_line_filename=`\
- expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
- ;;
- esac
-
- # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
- # prepend `./' in order to avoid that the tools take it as an option.
- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
- || command_line_filename="./$command_line_filename"
-
- # See if the file exists. If it doesn't we're in trouble since, even
- # though the user may be able to reenter a valid filename at the tex
- # prompt (assuming they're attending the terminal), this script won't
- # be able to find the right xref files and so forth.
- test -r "$command_line_filename" ||
- error 1 "cannot read $command_line_filename, skipping."
-
- # Get the name of the current directory.
- in_dir=`func_dirname "$command_line_filename"`
- in_dir_abs=`absolute "$in_dir"`
- # In a clean build, we `cd', so get an absolute file name.
- if $tidy; then
- in_dir=$in_dir_abs
- fi
-
- # Strip directory part but leave extension.
- in_base=`basename "$command_line_filename"`
- # Strip extension.
- in_noext=`noext "$in_base"`
-
- # The normalized file name to compile. Must always point to the
- # file to actually compile (in case of recoding, macro-expansion etc.).
- in_input=$in_dir/$in_base
-
-
- # Compute the output file name.
- if test x"$oname" != x; then
- out_name=$oname
- else
- out_name=$in_noext.`out_lang_ext`
- fi
- out_dir=`func_dirname "$out_name"`
- out_dir_abs=`absolute "$out_dir"`
- out_base=`basename "$out_name"`
- out_noext=`noext "$out_base"`
-}
-
-
-## -------------- ##
-## TeXify files. ##
-## -------------- ##
-
-for command_line_filename
-do
- verbose "Processing $command_line_filename ..."
-
- input_file_name_decode
-
- # `texinfo' or `latex'?
- in_lang=`compute_language "$command_line_filename"`
-
- # An auxiliary directory used for all the auxiliary tasks involved
- # in compiling this document.
- case $build_dir in
- '' | . ) t2ddir=$out_noext.t2d ;;
- *) # Avoid collisions between multiple occurrences of the same
- # file, so depend on the output path. Remove leading `./',
- # at least to avoid creating a file starting with `.!', i.e.,
- # an invisible file. The sed expression is fragile if the cwd
- # has active characters. Transform / into ! so that we don't
- # need `mkdir -p'. It might be something to reconsider.
- t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
- sed "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
- esac
- # Remove it at exit if clean mode.
- trap "cleanup" 0 1 2 15
-
- ensure_dir "$build_dir" "$t2ddir"
-
- # We will change directory, better work with an absolute path...
- t2ddir=`absolute "$t2ddir"`
- # Sometimes there are incompatibilities between auxiliary files for
- # DVI and PDF. The contents can also change whether we work on PDF
- # and/or DVI. So keep separate spaces for each.
- workdir=$t2ddir/`out_lang_tex`
- ensure_dir "$workdir"
-
- # _build. In a tidy build, where the auxiliary files are output.
- if $tidy; then
- work_build=$workdir/build
- else
- work_build=.
- fi
-
- # _bak. Copies of the previous auxiliary files (another round is
- # run if they differ from the new ones).
- work_bak=$workdir/bak
-
- # Make those directories.
- ensure_dir "$work_build" "$work_bak"
-
- case $action in
- compile)
- # Compile the document.
- compile
- cleanup
- ;;
-
- mostly-clean)
- mostly_clean
- ;;
- esac
-done
-
-verbose "done."
-exit 0 # exit successfully, not however we ended the loop.
diff --git a/configure.ac b/configure.ac
index 074672f..8d281ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,6 @@ AC_PREREQ([2.61])
AC_INIT([Olena], [1.0a], [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])
@@ -36,125 +33,14 @@ AC_CONFIG_FILES([build-aux/Makefile])
# Automake.
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
-# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
- [Package Full name.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
- [Bug report address.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_STRING], ["$PACKAGE_STRING"],
- [Full name and version.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"],
- [Package Version.])
-
-## --------------------- ##
-## C++ compiler set up. ##
-## --------------------- ##
-
-# If the user doesn't provide any CXXFLAGS, prevent Autoconf from
-# settings its own default ones (e.g., `-g -O2' for g++).
-if test ! ${CXXFLAGS+set}; then
- CXXFLAGS=""
-fi
-
-# Look for a C++ compiler.
-AC_LANG([C++])
-AC_PROG_CXX
-
-# Set `ICPC' to `yes' if the Intel C++ compiler is used.
-test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes
-
-# GNU C++ compiler setup.
-if test "$GXX" = yes; then
- # Speed up compiling times.
- CXXFLAGS="$CXXFLAGS -pipe"
-
- # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
- # a high optimization level (`-O3') and without
- # `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
- # Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
- #
- # So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
- # to `-fno-strict-aliasing'.
- if $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then
- STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing
- fi
-fi
-AC_SUBST([STRICT_ALIASING_CXXFLAGS])
-
-
-# Adjusting warning options according to compilers.
-AC_ARG_VAR([WARNINGS_CXXFLAGS], [C++ compiler warning flags])
-case "$CXX" in
- # Intel compiler
- *icpc*)
- WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418"
- ;;
- *)
- WARNINGS_CXXFLAGS="-Wall -W"
- ;;
-esac
-
-
-# ------------------------------ #
-# C++ compiler flags for tests. #
-# ------------------------------ #
-
-# FIXME: We might want to write an Autoconf macro to factor this.
-
-# Standard flags for tests.
-AC_ARG_VAR([TESTS_CXXFLAGS], [C++ compiler flags for tests])
-# We want no optimization for the tests (it slows down compiling
-# times), and debugging information.
-if test -z "$TESTS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for complex tests.
-AC_ARG_VAR([TESTS_CXXFLAGS_SPEED],
- [C++ compiler optimization flags for (complex) tests])
-# We want optimization for complex tests, and keep debugging flags
-# (still useful).
-if test -z "$TESTS_CXXFLAGS_SPEED"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for tests with with all debugging features turned on.
-AC_ARG_VAR([TESTS_CXXFLAGS_DEBUG], [C++ compiler debug flags])
-# We want no optimization for the tests (it slows down compiling
-# times), and a lot of debugging features.
-# * GNU C++ Library Debug Mode:
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html
-# * GNU C++ Library Compile Time Checks (a.k.a. concept checking):
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch29.html
-if test -z "$TESTS_CXXFLAGS_DEBUG"; then
- if test "$GXX" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -ggdb $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- elif test "$ICPC" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -g $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- fi
-fi
+AC_CONFIG_FILES([Makefile])
## ------------------------------ ##
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (Swilena, Scribo, etc). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -163,91 +49,19 @@ fi
AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
- enable_trimesh=yes
enable_swilena=yes
dnl<<lrde
enable_scribo=yes
dnl>>
- enable_apps=yes
- enable_tools=yes
fi])
-## ------------------ ##
-## Libraries set up. ##
-## ------------------ ##
-
-# Use Libtool.
-# To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used.
-AC_PROG_LIBTOOL
-
-# Check for Darwin.
-AC_CANONICAL_HOST
-AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
-
-
-## -------------------- ##
-## External libraries. ##
-## -------------------- ##
-
-# ------- #
-# Boost. #
-# ------- #
-
-BOOST_TUPLE
-AM_CONDITIONAL([HAVE_BOOST_TUPLE],
- [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes])
-
-# ----------------- #
-# CFITSIO library. #
-# ----------------- #
-
-OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio])
-
-# ---------- #
-# Magick++. #
-# ---------- #
-
-OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx],
- [MAGICKXX], [], [ImageMagick++])
-
-# ---- #
-# Qt. #
-# ---- #
-
-AT_WITH_QT([xml], [], [], [:], [oln_have_qt=yes])
-if test x$oln_have_qt = xyes; then
- AT_REQUIRE_QT_VERSION([4],
- AC_MSG_WARN([Qt-dependent programs will be disabled.]),
- oln_have_expected_qt_version=yes)
-fi
-AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes])
-
-# -------------- #
-# TIFF library. #
-# -------------- #
-
-OLN_WITH_LIB([TIFF], [tiff.h], [tiff])
-
-# --------------------------------- #
-# GDCM library (Grassroots DiCom). #
-# --------------------------------- #
-
-OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
- [GDCM],
- m4_do([-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF],
- [ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
- [ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+## -------- ##
+## Milena. ##
+## -------- ##
-AC_ARG_ENABLE([trimesh],
- [AS_HELP_STRING([--enable-trimesh],
- [build the (bundled) trimesh2 library])])
-AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
+# Milena is always enabled.
+AC_CONFIG_SUBDIRS([milena])
## --------- ##
@@ -274,341 +88,4 @@ AC_CONFIG_SUBDIRS([scribo])
dnl>>
-## --------------- ##
-## Configuration. ##
-## --------------- ##
-
-# Ask for config.h creation.
-AC_CONFIG_HEADERS([config.h])
-
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
-# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
-
-# Ask for the Makefile creations.
-AC_CONFIG_FILES([
- Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
-])
-
-
-## ------- ##
-## Tests. ##
-## ------- ##
-
-# Ask for the creation of a milena/tests/data.hh, used to access to
-# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
-
-# Ask for the creation of tests' Makefiles.
-AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- 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/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
-])
-
-dnl<<lrde
-AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
-])
-dnl>>
-
-
-## -------------- ##
-## Applications. ##
-## -------------- ##
-
-# Ask for the creation of a milena/apps/data.hh, used to access to
-# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
-
-AC_ARG_ENABLE([apps],
- [AS_HELP_STRING([--enable-apps],
- [enable application])])
-AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
-
-# Ask for the creation of applications' Makefiles.
-AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
-])
-
-# Configure tests.
-# FIXME: Consider using `sed' instead of `configure' to create these
-# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
-
-# Flags for apps.
-AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
-# We want fast binaries for apps.
-if test -z "$APPS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-## ------- ##
-## Tools. ##
-## ------- ##
-
-AC_ARG_ENABLE([tools],
- [AS_HELP_STRING([--enable-tools], [enable tools])])
-AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
-
-# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
-
-# Flags for tools.
-AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
-# We want fast binaries for tools.
-if test -z "$TOOLS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-
-## ----------------- ##
-## Verbose display. ##
-## ----------------- ##
-
-# Do not print this information by default, since `configure' outputs
-# should be kept short. Longer explanations are always available in
-# config.log.
-
-AC_ARG_ENABLE([verbose],
- [AS_HELP_STRING([--enable-verbose], [enable verbose display])],
- [if test "x$enable_verbose" != xno; then
- AC_MSG_RESULT([
--------------------------------------------------------------------------------
-Configuration summary.
-
-
-Host system type: $host
-Build system type: $build
-
-================
-| Dependencies |
-================
-
-
- Option Enabled and available
--------------------------------------------------------------------------------
-Boost Tuple --with-boost=@<:@=DIR@:>@ $oln_have_boost_tuple
-CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
-GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
-Magick++ --with-magickxx $oln_have_magickxx
-Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
-TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
--------------------------------------------------------------------------------
-
-
-
-
-=============
-| Utilities |
-=============
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Apps --enable-apps $enable_apps
-Tools --enable-tools $enable_tools
--------------------------------------------------------------------------------
-
-
-
-Options used to compile and link:
- PREFIX = $PREFIX_DIR
- EXEC-PREFIX = $EXEC_PREFIX_DIR
- VERSION = $PACKAGE_VERSION
- CC = $CC
- CFLAGS = $CFLAGS
- CPPFLAGS = $MAGICK_CPPFLAGS
- DEFS = $DEFS
- LDFLAGS = $LDFLAGS
- LIBS = $MAGICK_LIBS
- CXX = $CXX
- CXXFLAGS = $CXXFLAGS
- PKG_CONFIG = $PKG_CONFIG
- QT_PATH = $QT_PATH
- QMAKE = $QMAKE
- MOC = $MOC
- UIC = $UIC
- RCC = $RCC
- BOOST_ROOT = $BOOST_ROOT
- MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS
- MAGICKXX_LIBS = $MAGICKXX_LDFLAGS
- APPS_CXXFLAGS = $APPS_CXXFLAGS
- TOOLS_CXXFLAGS = $TOOLS_CXXFLAGS
-
-
-
-*******************************************************************************
-Olena is configured as stated above. Please verify that this configuration
-matches your expectations.
-
-Then, type 'make' to build Olena and 'make install' to install it on
-your system.
-])
-fi])
-
-
-## -------- ##
-## Output. ##
-## -------- ##
-
AC_OUTPUT
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-535-g1e12049 Have Milena be in charge of its own configuration and distribution.
by Roland Levillain
* configure.ac: Remove parts now handled by Milena's configure.ac.
* Makefile.am (ACLOCAL_AMFLAGS): Remove.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
Remove all Milena files.
(dist-hook): Do not regen Milena's unit tests, as Milena itself is
now in charge of this.
* NEWS, README: Update.
* build-aux/tex.mk,
* build-aux/texi2dvi,
Remove.
* build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
---
.gitignore | 3 -
ChangeLog | 16 +
Makefile.am | 67 +--
NEWS | 6 +-
README | 46 +-
build-aux/Makefile.am | 6 +-
build-aux/tex.mk | 47 --
build-aux/texi2dvi | 1959 -------------------------------------------------
configure.ac | 537 +-------------
9 files changed, 41 insertions(+), 2646 deletions(-)
delete mode 100644 build-aux/tex.mk
delete mode 100755 build-aux/texi2dvi
diff --git a/.gitignore b/.gitignore
index 60e1d08..4bc335c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,6 @@ Makefile
/autoscan.log
/config
/config.cache*
-/config.h
-/config.h?in*
-/config.hin
/config.log*
/config.status*
/configure
diff --git a/ChangeLog b/ChangeLog
index 16f6d3b..95f6f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Have Milena be in charge of its own configuration and distribution.
+
+ * configure.ac: Remove parts now handled by Milena's configure.ac.
+ * Makefile.am (ACLOCAL_AMFLAGS): Remove.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
+ Remove all Milena files.
+ (dist-hook): Do not regen Milena's unit tests, as Milena itself is
+ now in charge of this.
+ * NEWS, README: Update.
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi,
+ Remove.
+ * build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
+
2010-10-26 Roland Levillain <roland(a)lrde.epita.fr>
Move trimesh2 into Milena.
diff --git a/Makefile.am b/Makefile.am
index 81168a9..483ab5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-ACLOCAL_AMFLAGS = -I m4
-
SUBDIRS = build-aux milena
if ENABLE_SWILENA
@@ -47,76 +45,19 @@ REGEN_SUBDIRS += milena scribo
LRDE_STRIPPED_DIST_FILES = \
$(distdir)/Makefile.am \
- $(distdir)/configure.ac \
- $(distdir)/milena/mln/accu/math/all.hh \
- $(distdir)/milena/mln/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/fun_image.hh \
- $(distdir)/milena/mln/data/all.hh \
- $(distdir)/milena/mln/essential/routine.hh \
- $(distdir)/milena/mln/fun/all.hh \
- $(distdir)/milena/mln/fun/essential.hh \
- $(distdir)/milena/mln/fun/v2v/all.hh \
- $(distdir)/milena/mln/fun/v2v/essential.hh \
- $(distdir)/milena/mln/linear/all.hh \
- $(distdir)/milena/mln/trait/all.hh \
- $(distdir)/milena/mln/trait/ch_value.hh \
- $(distdir)/milena/mln/value/all.hh \
- $(distdir)/milena/mln/value/essential.hh \
- $(distdir)/milena/tests/Makefile.am \
- $(distdir)/milena/tests/convert/Makefile.am \
- $(distdir)/milena/tests/extract/Makefile.am \
- $(distdir)/milena/tests/fun/v2v/Makefile.am \
- $(distdir)/milena/tests/linear/Makefile.am \
- $(distdir)/milena/tests/linear/gaussian/Makefile.am \
- $(distdir)/milena/tests/registration/Makefile.am \
- $(distdir)/milena/tests/trait/ch_value.cc \
- $(distdir)/milena/tests/value/Makefile.am
+ $(distdir)/configure.ac
LRDE_NODIST_FILES = \
- $(distdir)/milena/tests/convert/to_hsl.cc \
- $(distdir)/milena/tests/extract/blue.cc \
- $(distdir)/milena/tests/extract/green.cc \
- $(distdir)/milena/tests/extract/hue.cc \
- $(distdir)/milena/tests/extract/lum.cc \
- $(distdir)/milena/tests/extract/red.cc \
- $(distdir)/milena/tests/extract/sat.cc \
- $(distdir)/milena/tests/fun/v2v/component.cc \
- $(distdir)/milena/tests/fun/v2v/hsl_to_rgb.cc \
- $(distdir)/milena/tests/fun/v2v/rgb_to_hsl.cc \
- $(distdir)/milena/tests/linear/gaussian.cc \
- $(distdir)/milena/tests/linear/gaussian/filter.cc \
- $(distdir)/milena/tests/registration/registration.cc \
- $(distdir)/milena/tests/value/stack.cc \
$(distdir)/scribo
-## FIXME: Running `build-aux/build_unit_test.sh' just to update
-## `milena/tests/unit_test/unit-tests.mk' is overkill:
-##
-## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
-## => We should just regen `unit-tests.mk', not the `.cc' files.
-##
-## 2. It visits (almost) all the directories and files under
-## milena/mln/ (which admittedly a smaller issue compared to the
-## previous one)
-## => Prune `unit-tests.mk' instead of regenerating it. The
-## simplest solution is probably to equip `unit-tests.mk' in the
-## first place with `<<lrde'/`>>' tags, then prune it with
-## dist-strip.
-##
-
# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files.
dist-hook:
for f in $(LRDE_STRIPPED_DIST_FILES); do \
$(top_srcdir)/build-aux/strip-lrde $$f; \
done; \
- rm -rf $(LRDE_NODIST_FILES) && \
- $(top_srcdir)/build-aux/build_unit_test.sh \
- $(distdir)/milena/mln \
- $(distdir)/milena/tests/unit_test \
- $(top_srcdir)/milena/tests/unit_test/disabled_tests \
- mln \
- && \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && \
( \
cd $(distdir); \
set -evx; \
diff --git a/NEWS b/NEWS
index 36bf98f..d8ac176 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
* Olena 1.0a
+ * Starting with Olena 1.1, Milena, Swilena and Scribo are
+ independent components of the project, distributed together
+ with the Olena package and as standalone packages.
+
* Olena 1.0 July 14, 2009
@@ -352,7 +356,7 @@ End:
----
-Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009 EPITA Research and
+Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009, 2010 EPITA Research and
Development Laboratory (LRDE)
This file is part of Olena.
diff --git a/README b/README
index cc49a02..6400941 100644
--- a/README
+++ b/README
@@ -336,7 +336,7 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
+ * the documentation in `/usr/local/share/doc/olena/`.
And optionally:
@@ -368,42 +368,17 @@ build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
m4
Extra Autoconf macros.
milena
+ Milena C++ library.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
-
- tools
- Example tools.
-
- mesh
- Some 3D meshes, mostly used for test purpose.
-
- img
- Some (2D) images, mostly used for test purpose.
-
- demos
- Demos of Milena.
+scribo
+ Olena-Scribo project.
swilena
-
- python
- Some Python bindings for Milena.
+ Swilena project.
===================
@@ -415,10 +390,10 @@ Olena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.0, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.0.1
=========================== =============================================
@@ -433,7 +408,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -457,11 +432,6 @@ There are other sources of interest in the distribution.
- Headline news about the project can be found in the file ``NEWS`` at
the root of the source tree.
-- The library reference HTML documentation, generated by Doxygen_, is
- located in ``doc/user/html/``.
-
-.. _Doxygen: http://www.doxygen.org
-
License
=======
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 0e1ad0f..7fa77cb 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -15,9 +15,5 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# texi2dvi: produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# Part of the Texinfo project (http://www.gnu.org/software/texinfo/).
-EXTRA_DIST = texi2dvi
-
# File generators.
-EXTRA_DIST += generate_dist_headers.sh build_unit_test.sh
+EXTRA_DIST = generate_dist_headers.sh build_unit_test.sh
diff --git a/build-aux/tex.mk b/build-aux/tex.mk
deleted file mode 100644
index da35475..0000000
--- a/build-aux/tex.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-## tex.mk -*- Makefile-Automake -*-
-
-## A small subset of LRDE's share/make/tex.mk.
-
-## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
-##
-## This file is part of Olena.
-##
-## Olena is free software: you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free
-## Software Foundation, version 2 of the License.
-##
-## Olena is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-
-build_aux_dir = $(top_srcdir)/build-aux
-
-TEXI2DVI = $(build_aux_dir)/texi2dvi
-TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch
-
-
-TEXI2PDF = $(TEXI2DVI) --pdf
-TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS)
-
-# 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
-
-.tex.pdf:
- $(TEXI2PDF) $(TEXI2PDF_FLAGS) -o $@ $<
-
-tex-mostlyclean:
- rm -rf tmp.t2d
-.PHONY: tex-mostlyclean
-# mostlyclean-local is an Automake special target.
-mostlyclean-local: tex-mostlyclean
-.PHONY: mostlyclean-local
diff --git a/build-aux/texi2dvi b/build-aux/texi2dvi
deleted file mode 100755
index fce73b9..0000000
--- a/build-aux/texi2dvi
+++ /dev/null
@@ -1,1959 +0,0 @@
-#! /bin/sh
-# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.157 2010/02/09 18:37:08 karl Exp $
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Noah Friedman.
-#
-# Please send bug reports, etc. to bug-texinfo(a)gnu.org.
-# If possible, please send a copy of the output of the script called with
-# the `--debug' option when making a bug report.
-
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
- && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-# No failure shall remain unpunished.
-set -e
-
-# This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.157 $'
-rcs_version=`set - $rcs_revision; echo $2`
-program=`echo $0 | sed -e 's!.*/!!'`
-
-build_mode=${TEXI2DVI_BUILD_MODE:-local}
-build_dir=${TEXI2DVI_BUILD_DIRECTORY:-.}
-
-# Initialize variables for option overriding and otherwise.
-# Don't use `unset' since old bourne shells don't have this command.
-# Instead, assign them an empty value.
-action=compile
-batch=false # interact normally
-catcode_special=maybe
-debug=false
-escape="\\"
-expand=false # true for expansion via makeinfo
-includes=
-line_error=true # pass --file-line-error to TeX
-max_iters=-1 # keep going forever
-oname= # --output
-out_lang=dvi
-quiet=false # let the tools' message be displayed
-recode=false
-set_language=
-src_specials=
-latex2html=hevea # or set to tex4ht
-textra= # Extra TeX commands to insert in the input file.
-txiprereq=19990129 # minimum texinfo.tex version with macro expansion
-verb=false # true for verbose mode
-translate_file= # name of charset translation file
-recode_from= # if not empty, recode from this encoding to @documentencoding
-
-orig_pwd=`pwd`
-
-# We have to initialize IFS to space tab newline since we save and
-# restore IFS and apparently POSIX allows stupid/broken behavior with
-# empty-but-set IFS.
-# http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
-# We need space, tab and new line, in precisely that order. And don't leave
-# trailing blanks.
-space=' '
-tab=' '
-newline='
-'
-IFS="$space$tab$newline"
-
-# In case someone pedantic insists on using grep -E.
-: ${EGREP=egrep}
-
-# Systems which define $COMSPEC or $ComSpec use semicolons to separate
-# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
-# might be inherited, but : is used.
-if test -n "$COMSPEC$ComSpec" \
- && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then
- path_sep=";"
-else
- path_sep=":"
-fi
-
-# Pacify verbose cds.
-CDPATH=${ZSH_VERSION+.}$path_sep
-
-# If $TEX is set to a directory, don't use it.
-test -n "$TEX" && test -d "$TEX" && unset TEX
-
-#
-## --------------------- ##
-## Auxiliary functions. ##
-## --------------------- ##
-
-# In case `local' is not supported by the shell, provide a function
-# that simulates it by simply performing the assignments. This means
-# that we must not expect `local' to work, i.e., we must not (i) rely
-# on it during recursion, and (ii) have two local declarations of the
-# same variable. (ii) is easy to check statically, and our test suite
-# does make sure there is never twice a static local declaration of a
-# variable. (i) cannot be checked easily, so just be careful.
-#
-# Note that since we might use a function simulating `local', we can
-# no longer rely on the fact that no IFS-splitting is performed. So,
-# while
-#
-# foo=$bar
-#
-# is fine (no IFS-splitting), never write
-#
-# local foo=$bar
-#
-# but rather
-#
-# local foo="$bar"
-(
- foo=bar
- test_local () {
- local foo=foo
- }
- test_local
- test $foo = bar
-) || local () {
- case $1 in
- *=*) eval "$1";;
- esac
-}
-
-
-# cd_orig
-# -------
-# Return to the original directory.
-cd_orig ()
-{
- # In case $orig_pwd is on a different drive (for DOS).
- cd /
-
- # Return to the original directory so that
- # - the next file is processed in correct conditions
- # - the temporary file can be removed
- cd "$orig_pwd" || exit 1
-}
-
-# func_dirname FILE
-# -----------------
-# Return the directory part of FILE.
-func_dirname ()
-{
- dirname "$1" 2>/dev/null \
- || { echo "$1" | sed 's!/[^/]*$!!;s!^$!.!'; }
-}
-
-
-# noexit FILE
-# -----------
-# Return FILE with one extension remove. foo.bar.baz -> foo.bar.
-noext ()
-{
- echo "$1" | sed -e 's/\.[^/.][^/.]*$//'
-}
-
-
-# absolute NAME -> ABS-NAME
-# -------------------------
-# Return an absolute path to NAME.
-absolute ()
-{
- case $1 in
- [\\/]* | ?:[\\/]*)
- # Absolute paths don't need to be expanded.
- echo "$1"
- ;;
- *) local slashes
- slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
- local rel
- rel=$orig_pwd/`func_dirname "$1"`
- if test -d "$rel"; then
- (cd "$rel" 2>/dev/null &&
- local n
- n=`pwd`/`basename "$1"`"$slashes"
- echo "$n")
- else
- error 1 "not a directory: $rel"
- fi
- ;;
- esac
-}
-
-
-# ensure_dir DIR1 DIR2...
-# -----------------------
-# Make sure the directories exist.
-ensure_dir ()
-{
- for dir
- do
- # Beware that in parallel builds we may have several concurrent
- # attempts to create the directory. So fail only if "mkdir"
- # failed *and* the directory still does not exist.
- test -d "$dir" \
- || mkdir "$dir" \
- || test -d "$dir" \
- || error 1 "cannot create directory: $dir"
- done
-}
-
-
-# error EXIT_STATUS LINE1 LINE2...
-# --------------------------------
-# Report an error and exit with failure if EXIT_STATUS is non null.
-error ()
-{
- local s="$1"
- shift
- report "$@"
- if test "$s" != 0; then
- exit $s
- fi
-}
-
-
-# findprog PROG
-# -------------
-# Return true if PROG is somewhere in PATH, else false.
-findprog ()
-{
- local saveIFS="$IFS"
- IFS=$path_sep # break path components at the path separator
- for dir in $PATH; do
- IFS=$saveIFS
- # The basic test for an executable is `test -f $f && test -x $f'.
- # (`test -x' is not enough, because it can also be true for directories.)
- # We have to try this both for $1 and $1.exe.
- #
- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
- # also `test -f' has this enhancement, but not on DJGPP. (Both are
- # design decisions, so there is little chance to make them consistent.)
- # Thusly, it seems to be difficult to make use of these enhancements.
- #
- if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
- return 0
- fi
- done
- return 1
-}
-
-# report LINE1 LINE2...
-# ---------------------
-# Report some information on stderr.
-report ()
-{
- for i in "$@"
- do
- echo >&2 "$0: $i"
- done
-}
-
-
-# run COMMAND-LINE
-# ----------------
-# Run the COMMAND-LINE verbosely, and catching errors as failures.
-run ()
-{
- verbose "Running $@"
- "$@" 2>&5 1>&2 ||
- error 1 "$1 failed"
-}
-
-
-# usage
-# -----
-# Display usage and exit successfully.
-usage ()
-{
- # We used to simply have `echo "$usage"', but coping with the
- # changing behavior of `echo' is much harder than simply using a
- # here-doc.
- #
- # echo '\noto' echo '\\noto' echo -e '\\noto'
- # bash 3.1 \noto \\noto \noto
- # bash 3.2 %oto \noto -e \noto
- #
- # where % denotes the eol character.
- cat <<EOF
-Usage: $program [OPTION]... FILE...
- texi2pdf [OPTION]... FILE...
- pdftexi2dvi [OPTION]... FILE...
-
-Run each Texinfo or (La)TeX FILE through TeX in turn until all
-cross-references are resolved, building all indices. The directory
-containing each FILE is searched for included files. The suffix of FILE
-is used to determine its language ((La)TeX or Texinfo). To process
-(e)plain TeX files, set the environment variable LATEX=tex.
-
-In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX,
-the FILE may also be composed of the following simple TeX commands.
- \`\\input{FILE}' the actual file to compile
- \`\\nonstopmode' same as --batch
-
-When invoked as \`texi2pdf' or \`pdftexi2dvi', or given the option --pdf
-or --dvipdf, generate PDF output. Otherwise, generate DVI.
-
-General options:
- -b, --batch no interaction
- -D, --debug turn on shell debugging (set -x)
- -h, --help display this help and exit successfully
- -o, --output=OFILE leave output in OFILE (implies --clean);
- only one input FILE may be specified in this case
- -q, --quiet no output unless errors (implies --batch)
- -s, --silent same as --quiet
- -v, --version display version information and exit successfully
- -V, --verbose report on what is done
-
-TeX tuning:
- -@ use @input instead of \input for preloaded Texinfo
- -e, -E, --expand force macro expansion using makeinfo
- -I DIR search DIR for Texinfo files
- -l, --language=LANG specify LANG for FILE, either latex or texinfo
- --no-line-error do not pass --file-line-error to TeX
- -r, --recode call recode before TeX to translate input
- --recode-from=ENC recode from ENC to the @documentencoding
- --src-specials pass --src-specials to TeX
- -t, --command=CMD insert CMD in copy of input file
- or --texinfo=CMD multiple values accumulate
- --translate-file=FILE use given charset translation file for TeX
-
-Output format:
- --dvi output a DVI file [default]
- --dvipdf output a PDF file via DVI (using dvipdf)
- --html output an HTML file. Use HeVeA for LaTeX files
- --info output an Info file. Use HeVeA for LaTeX files
- -p, --pdf use pdftex or pdflatex for processing
- --ps output a PDF file via DVI (using dvips)
- --text output a plain text file. Use HeVeA for LaTeX files
-
-Build modes:
- --build=MODE specify the treatment of auxiliary files [$build_mode]
- --tidy same as --build=tidy
- -c, --clean same as --build=clean
- --build-dir=DIR specify where the tidy compilation is performed;
- implies --tidy;
- defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
- --mostly-clean remove the auxiliary files and directories
- but not the output
- --max-iterations=N don't process files more than N times
-
-The MODE specifies where the TeX compilation takes place, and, as a
-consequence, how auxiliary files are treated. The build mode
-can also be set using the environment variable TEXI2DVI_BUILD_MODE.
-
-Valid MODEs are:
- \`local' compile in the current directory, leaving all the auxiliary
- files around. This is the traditional TeX use.
- \`tidy' compile in a local *.t2d directory, where the auxiliary files
- are left. Output files are copied back to the original file.
- \`clean' same as \`tidy', but remove the auxiliary directory afterwards.
- Every compilation therefore requires the full cycle.
-
-Using the \`tidy' mode brings several advantages:
- - the current directory is not cluttered with plethora of temporary files.
- - clutter can be even further reduced using --build-dir=dir: all the *.t2d
- directories are stored there.
- - clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
- or --build-dir=\$HOME/.t2d.
- - the output file is updated after every succesful TeX run, for
- sake of concurrent visualization of the output. In a \`local' build
- the viewer stops during the whole TeX run.
- - if the compilation fails, the previous state of the output file
- is preserved.
- - PDF and DVI compilation are kept in separate subdirectories
- preventing any possibility of auxiliary file incompatibility.
-
-On the other hand, because \`tidy' compilation takes place in another
-directory, occasionally TeX won't be able to find some files (e.g., when
-using \\graphicspath): in that case use -I to specify the additional
-directories to consider.
-
-The values of the BIBTEX, DVIPDF, DVIPS, LATEX, MAKEINDEX, MAKEINFO,
-PDFLATEX, PDFTEX, TEX, TEXINDEX, and THUMBPDF environment variables are used
-to run those commands, if they are set. Any CMD strings are added after
-@setfilename for Texinfo input, in the first line for LaTeX input.
-
-Report bugs to bug-texinfo(a)gnu.org,
-general questions and discussion to help-texinfo(a)gnu.org.
-GNU Texinfo home page: <http://www.gnu.org/software/texinfo/>
-General help using GNU software: <http://www.gnu.org/gethelp/>
-EOF
- exit 0
-}
-
-
-# verbose WORD1 WORD2
-# -------------------
-# Report some verbose information.
-verbose ()
-{
- if $verb; then
- echo >&2 "$0: $@"
- fi
-}
-
-
-# version
-# -------
-# Display version info and exit succesfully.
-version ()
-{
- cat <<EOF
-texi2dvi (GNU Texinfo 4.13) $rcs_version
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-EOF
- exit 0
-}
-
-
-## ---------------- ##
-## Handling lists. ##
-## ---------------- ##
-
-
-# list_append LIST-NAME ELEM
-# --------------------------
-# Set LIST-NAME to its former contents, with ELEM appended.
-list_append ()
-{
- local la_l="$1"
- shift
- eval set X \$$la_l "$@"
- shift
- eval $la_l=\""$@"\"
-}
-
-
-# list_concat_dirs LIST-NAME DIR-LIST
-# -----------------------------------
-# Append to LIST-NAME all the components (included empty) from
-# the $path_sep separated list DIR-LIST. Make the paths absolute.
-list_concat_dirs ()
-{
- local lcd_list="$1"
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_EMPTY="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- save_IFS=$IFS
- IFS=$path_sep
- set x `echo "$2" | eval sed $replace_EMPTY`; shift
- IFS=$save_IFS
- local dir
- for dir
- do
- case $dir in
- EMPTY)
- list_append $lcd_list ""
- ;;
- *)
- if test -d $dir; then
- dir=`absolute "$dir"`
- list_append $lcd_list "$dir"
- fi
- ;;
- esac
- done
-}
-
-
-# list_prefix LIST-NAME SEP -> STRING
-# -----------------------------------
-# Return a string that is composed of the LIST-NAME with each item
-# preceded by SEP.
-list_prefix ()
-{
- local lp_p="$2"
- eval set X \$$1
- shift
- local lp_res
- for i
- do
- lp_res="$lp_res \"$lp_p\" \"$i\""
- done
- echo "$lp_res"
-}
-
-# list_infix LIST-NAME SEP -> STRING
-# ----------------------------------
-# Same as list_prefix, but a separator.
-list_infix ()
-{
- eval set X \$$1
- shift
- local la_IFS="$IFS"
- IFS=$path_sep
- echo "$*"
- IFS=$la_IFS
-}
-
-# list_dir_to_abs LIST-NAME
-# -------------------------
-# Convert the list to using only absolute dir names.
-# Currently unused, but should replace absolute_filenames some day.
-list_dir_to_abs ()
-{
- local ld_l="$1"
- eval set X \$$ld_l
- shift
- local ld_res
- for dir
- do
- dir=`absolute "$dir"`
- test -d "$dir" || continue
- ld_res="$ld_res \"$dir\""
- done
- set X $ld_res; shift
- eval $ld_l=\"$@\"
-}
-
-
-## ------------------------------ ##
-## Language auxiliary functions. ##
-## ------------------------------ ##
-
-
-# out_lang_set LANG
-# -----------------
-out_lang_set ()
-{
- case $1 in
- dvi|dvipdf|html|info|pdf|ps|text) out_lang=$1;;
- *) error 1 "invalid output format: $1";;
- esac
-}
-
-
-# out_lang_tex
-# ------------
-# Return the tex output language (DVI or PDF) for $OUT_LANG.
-out_lang_tex ()
-{
- case $out_lang in
- dvi | ps | dvipdf ) echo dvi;;
- pdf ) echo $out_lang;;
- html | info | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-# out_lang_ext
-# ------------
-# Return the extension for $OUT_LANG.
-out_lang_ext ()
-{
- case $out_lang in
- dvipdf ) echo pdf;;
- dvi | html | info | pdf | ps | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-## ------------------------- ##
-## TeX auxiliary functions. ##
-## ------------------------- ##
-
-# Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
-# Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
-TEXINPUTS TFMFONTS"
-for var in $tex_envvars; do
- eval ${var}_orig=\$$var
- export $var
-done
-
-
-# absolute_filenames TEX-PATH -> TEX-PATH
-# ---------------------------------------
-# Convert relative paths to absolute paths, so we can run in another
-# directory (e.g., in tidy build mode, or during the macro-support
-# detection). Prepend ".".
-absolute_filenames ()
-{
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- local res
- res=`echo "$1" | eval sed $replace_empty`
- save_IFS=$IFS
- IFS=$path_sep
- set x $res; shift
- res=.
- for dir
- do
- case $dir in
- EMPTY)
- res=$res$path_sep
- ;;
- *)
- if test -d "$dir"; then
- res=$res$path_sep`absolute "$dir"`
- else
- # Even if $dir is not a directory, preserve it in the path.
- # It might contain metacharacters that TeX will expand in
- # turn, e.g., /some/path/{a,b,c}. This will not get the
- # implicit absolutification of the path, but we can't help that.
- res=$res$path_sep$dir
- fi
- ;;
- esac
- done
- echo "$res"
-}
-
-
-# output_base_name FILE
-# ---------------------
-# The name of FILE, possibly renamed to satisfy --output.
-# FILE is local, there is no directory part.
-output_base_name ()
-{
- case $oname in
- '') echo "$1";;
- *) local out_noext
- out_noext=`noext "$oname"`
- local file_ext
- file_ext=`echo "$1" | sed 's/^.*\.//'`
- echo "$out_noext.$file_ext"
- ;;
- esac
-}
-
-
-# destdir
-# -------
-# Return the name of the directory where the output is expected.
-destdir ()
-{
- case $oname in
- '') echo "$orig_pwd";;
- *) dirname "$oname";;
- esac
-}
-
-
-# move_to_dest FILE...
-# --------------------
-# Move FILE to the place where the user expects it. Truly move it, that
-# is, it must not remain in its build location unless that is also the
-# output location. (Otherwise it might appear as an extra file in make
-# distcheck.)
-#
-# FILE can be the principal output (in which case -o directly applies), or
-# an auxiliary file with the same base name.
-move_to_dest ()
-{
- # If we built in place, there is nothing to install, leave.
- case $tidy:$oname in
- false:) return;;
- esac
-
- local destfile
- local destdir
- local destbase
- local sourcedir
- local sourcebase
-
- for file
- do
- test -f "$file" ||
- error 1 "no such file or directory: $file"
- case $tidy:$oname in
- true:) destdir=$orig_pwd
- destfile=$destdir/$file;;
- *:*) destfile=`output_base_name "$file"`
- destdir=`dirname "$destfile"`;;
- esac
- # We want to compare the source location and the output location,
- # and if they are different, do the move. But if they are the
- # same, we must preserve the source. Since we can't assume
- # stat(1) or test -ef is available, resort to comparing the
- # directory names, canonicalized with pwd. We can't use cmp -s
- # since the output file might not actually change from run to run;
- # e.g., TeX DVI output is timestamped to only the nearest minute.
- destdir=`cd "$destdir" && pwd`
- destbase=`basename "$destfile"`
-
- sourcedir=`dirname "$file"`
- sourcedir=`cd "$sourcedir" && pwd`
- sourcebase=`basename "$file"`
-
- if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
- verbose "Moving $file to $destfile"
- rm -f "$destfile"
- mv "$file" "$destfile"
- fi
- done
-}
-
-
-## --------------------- ##
-## Managing xref files. ##
-## --------------------- ##
-
-# aux_file_p FILE
-# ---------------
-# Return with success if FILE is an aux file.
-aux_file_p ()
-{
- test -f "$1" || return 1
- case $1 in
- *.aux) return 0;;
- *) return 1;;
- esac
-}
-
-# bibaux_file_p FILE
-# ------------------
-# Return with success if FILE is an aux file containing citation
-# requests.
-bibaux_file_p ()
-{
- test -s "$1" || return 1
- if (grep '^\\bibstyle[{]' "$1" \
- && grep '^\\bibdata[{]' "$1" \
- ## The following line is suspicious: fails when there
- ## are citations in sub aux files. We need to be
- ## smarter in this case.
- ## && grep '^\\citation[{]' "$f"
- ) >&6 2>&1;
- then
- return 0
- fi
- return 1
-}
-
-# index_file_p FILE
-# -----------------
-# Return with success if FILE is an index file.
-index_file_p ()
-{
- test -f "$1" || return 1
- case $in_lang:$latex2html:`out_lang_tex`:`sed '1q' "$1"` in
- # When working with TeX4HT, *.idx are created by LaTeX. They must
- # be processed to produce *.4ix, *.4dx files. The *.4dx file is
- # passed to makeindex to produce the *.ind file. This sequence is
- # handled by run_index, so we are only interested in the *.idx
- # files, which have each "\indexentry" preceded by a
- # "\beforeentry".
- latex:tex4ht:html:"\\beforeentry {"*) return 0;;
-
- # When index.sty is used, there is a space before the brace.
- latex:*:*:"\\indexentry{"*|latex:*:*:"\\indexentry {"*) return 0;;
-
- texinfo:*:*:"\\entry{"*) return 0;;
-
- *) return 1;;
- esac
-}
-
-# xref_file_p FILE
-# ----------------
-# Return with success if FILE is an xref file (indexes, tables and lists).
-xref_file_p ()
-{
- test -f "$1" || return 1
- # If the file is not suitable to be an index or xref file, don't
- # process it. It's suitable if the first character is a
- # backslash or right quote or at, as long as the first line isn't
- # \input texinfo.
- case `sed '1q' "$1"` in
- "\\input texinfo"*) return 1;;
- [\\''@]*) return 0;;
- *) return 1;;
- esac
-}
-
-
-# generated_files_get FILENAME-NOEXT [PREDICATE-FILTER]
-# -----------------------------------------------------
-# Return the list of files generated by the TeX compilation of FILENAME-NOEXT.
-generated_files_get ()
-{
- local filter=true
- if test -n "$2"; then
- filter=$2
- fi
-
- # Gather the files created by TeX.
- (
- if test -f "$1.log"; then
- sed -n -e "s,^\\\\openout.* = \`\\(.*\\)'\\.,\\1,p" "$1.log"
- fi
- echo "$1.log"
- ) |
- # Depending on these files, infer outputs from other tools.
- while read file; do
- echo $file
- case $in_lang in
- texinfo)
- # texindex: texinfo.cp -> texinfo.cps
- if index_file_p $file; then
- echo ${file}s
- fi
- ;;
- latex)
- if aux_file_p $file; then
- # bibtex: *.aux -> *.bbl and *.blg.
- echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
- echo $file | sed 's/^\(.*\)\.aux$/\1.blg/'
- # -recorder: .fls
- echo $file | sed 's/^\(.*\)\.aux$/\1.fls/'
- fi
- ;;
- esac
- done |
- # Filter existing files matching the criterion.
- #
- # With an input file name containing a space, this produces a
- # "command not found" message (and filtering is ineffective).
- # The situation with a newline is presumably even worse.
- while read file; do
- if $filter "$file"; then
- echo $file
- fi
- done |
- sort |
- # Some files are opened several times, e.g., listings.sty's *.vrb.
- uniq
-}
-
-
-# xref_files_save
-# ---------------
-# Save the xref files.
-xref_files_save ()
-{
- # Save copies of auxiliary files for later comparison.
- xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
- if test -n "$xref_files_orig"; then
- verbose "Backing up xref files: $xref_files_orig"
- # The following line improves `cp $xref_files_orig "$work_bak"'
- # by preserving the directory parts. Think of
- # cp chap1/main.aux chap2/main.aux $work_bak.
- #
- # Users may have, e.g., --keep-old-files. Don't let this interfere.
- # (Don't use unset for the sake of ancient shells.)
- TAR_OPTIONS=; export TAR_OPTIONS
- tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
- fi
-}
-
-
-# xref_files_changed
-# ------------------
-# Whether the xref files were changed since the previous run.
-xref_files_changed ()
-{
- # LaTeX (and the package changebar) report in the LOG file if it
- # should be rerun. This is needed for files included from
- # subdirs, since texi2dvi does not try to compare xref files in
- # subdirs. Performing xref files test is still good since LaTeX
- # does not report changes in xref files.
- if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then
- return 0
- fi
-
- # If old and new lists don't at least have the same file list,
- # then one file or another has definitely changed.
- xref_files_new=`generated_files_get "$in_noext" xref_file_p`
- verbose "Original xref files = $xref_files_orig"
- verbose "New xref files = $xref_files_new"
- if test "x$xref_files_orig" != "x$xref_files_new"; then
- return 0
- fi
-
- # Compare each file until we find a difference.
- for this_file in $xref_files_new; do
- verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
- # cmp -s returns nonzero exit status if files differ.
- if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
- verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
- if $debug; then
- diff -u "$work_bak/$this_file" "$this_file"
- fi
- return 0
- fi
- done
-
- # No change.
- return 1
-}
-
-
-
-## ----------------------- ##
-## Running the TeX suite. ##
-## ----------------------- ##
-
-
-
-# run_tex ()
-# ----------
-# Run TeX as "$tex $in_input", taking care of errors and logs.
-run_tex ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:*:dvi|latex:tex4ht:html)
- tex=${LATEX:-latex};;
- latex:*:pdf)
- tex=${PDFLATEX:-pdflatex};;
- texinfo:*:dvi)
- # MetaPost also uses the TEX environment variable. If the user
- # has set TEX=latex for that reason, don't bomb out.
- case $TEX in
- *latex) tex=tex;; # don't bother trying to find etex
- *) tex=$TEX
- esac;;
- texinfo:*:pdf) tex=$PDFTEX;;
-
- *) error 1 "$out_lang not supported for $in_lang";;
- esac
-
- # do the special catcode trick for ~ in filenames only for Texinfo,
- # not LaTeX.
- if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
- catcode_special=true
- else
- catcode_special=false
- fi
-
- # Beware of aux files in subdirectories that require the
- # subdirectory to exist.
- case $in_lang:$tidy in
- latex:true)
- sed -n 's|^[ ]*\\include{\(.*\)/.*}.*|\1|p' "$in_input" |
- sort -u |
- while read d
- do
- ensure_dir "$work_build/$d"
- done
- ;;
- esac
-
- # Note that this will be used via an eval: quote properly.
- local cmd="$tex"
-
- # If possible, make TeX report error locations in GNU format.
- if $line_error; then
- if test "${tex_help:+set}" != set; then
- # Go to a temporary directory to try --help, since old versions that
- # don't accept --help will generate a texput.log.
- tex_help_dir=$t2ddir/tex_help
- ensure_dir "$tex_help_dir"
- tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1 || true`
- fi
- # The mk program and perhaps others want to parse TeX's
- # original error messages.
- case $tex_help in
- *file-line-error*) cmd="$cmd --file-line-error";;
- esac
- fi
-
- # Tell TeX about TCX file, if specified.
- test -n "$translate_file" && cmd="$cmd --translate-file=$translate_file"
-
- # Tell TeX to make source specials (for backtracking from output to
- # source, given a sufficiently smart editor), if specified.
- test -n "$src_specials" && cmd="$cmd $src_specials"
-
- # Tell TeX to be batch if requested.
- if $batch; then
- # \batchmode does not show terminal output at all, so we don't
- # want that. And even in batch mode, TeX insists on having input
- # from the user. Close its stdin to make it impossible.
- cmd="$cmd </dev/null '${escape}nonstopmode'"
- fi
-
- # we'd like to handle arbitrary input file names, especially
- # foo~bar/a~b.tex, since Debian likes ~ characters.
- if $catcode_special; then
- # $normaltilde is just to reduce line length in this source file.
- # The idea is to define \normaltilde as a catcode other ~ character,
- # then make the active ~ be equivalent to that, instead of the plain
- # TeX tie. Then when the active ~ appears in the filename, it will
- # be expanded to itself, as far as \input will see. (This is the
- # same thing that texinfo.tex does in general, BTW.)
- normaltilde="${escape}catcode126=12 ${escape}def${escape}normaltilde{~}"
- cmd="$cmd '$normaltilde${escape}catcode126=13 ${escape}let~\normaltilde '"
- fi
- # Other special (non-active) characters could be supported by
- # resetting their catcodes to other on the command line and changing
- # texinfo.tex to initialize everything to plain catcodes. Maybe someday.
-
- # append the \input command.
- cmd="$cmd '${escape}input'"
-
- # TeX's \input does not (easily or reliably) support whitespace
- # characters or other special characters in file names. Our intensive
- # use of absolute file names makes this worse: the enclosing directory
- # names may include white spaces. Improve the situation using a
- # symbolic link to the filename in the current directory, in tidy mode
- # only. Do not alter in_input.
- #
- # The filename is almost always tokenized using plain TeX conventions
- # (the exception would be if the user made a texinfo.fmt file). Not
- # all the plain TeX special characters cause trouble, but there's no
- # harm in making the link.
- #
- case $tidy:`func_dirname "$in_input"` in
- true:*["$space$tab$newline\"#\$%\\^_{}~"]*)
- _run_tex_file_name=`basename "$in_input"`
- if test ! -f "$_run_tex_file_name"; then
- # It might not be a file, clear it.
- run rm -f "$_run_tex_file_name"
- run ln -s "$in_input"
- fi
- cmd="$cmd '$_run_tex_file_name'"
- ;;
-
- *)
- cmd="$cmd '$in_input'"
- ;;
- esac
-
- verbose "$0: Running $cmd ..."
- if eval "$cmd" >&5; then
- case $out_lang in
- dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
- esac
- else
- error 1 "$tex exited with bad status, quitting."
- fi
-}
-
-# run_bibtex ()
-# -------------
-# Run bibtex on current file.
-# - If its input (AUX) exists.
-# - If some citations are missing (LOG contains `Citation').
-# or the LOG complains of a missing .bbl
-#
-# Don't try to be too smart:
-#
-# 1. Running bibtex only if the bbl file exists and is older than
-# the LaTeX file is wrong, since the document might include files
-# that have changed.
-#
-# 3. Because there can be several AUX (if there are \include's),
-# but a single LOG, looking for missing citations in LOG is
-# easier, though we take the risk to match false messages.
-run_bibtex ()
-{
- case $in_lang in
- latex) bibtex=${BIBTEX:-bibtex};;
- texinfo) return;;
- esac
-
- # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
- # The no .aux && \bibdata test is also for btxmac, in case it was the
- # first run of a bibtex-using document. Otherwise, it's possible that
- # bibtex would never be run.
- if test -r "$in_noext.aux" \
- && test -r "$in_noext.log" \
- && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
- || grep '.*Undefined citation' "$in_noext.log" \
- || grep 'No file .*\.bbl\.' "$in_noext.log") \
- || (grep 'No \.aux file' "$in_noext.log" \
- && grep '^\\bibdata' "$in_noext.aux")) \
- >&6 2>&1; \
- then
- for f in `generated_files_get "$in_noext" bibaux_file_p`
- do
- run $bibtex "$f"
- done
- fi
-}
-
-# run_index ()
-# ------------
-# Run texindex (or makeindex or texindy) on current index files. If
-# they already exist, and after running TeX a first time the index
-# files don't change, then there's no reason to run TeX again. But we
-# won't know that if the index files are out of date or nonexistent.
-run_index ()
-{
- local index_files=`generated_files_get $in_noext index_file_p`
- test -n "$index_files" ||
- return 0
-
- : ${MAKEINDEX:=makeindex}
- : ${TEXINDEX:=texindex}
- : ${TEXINDY:=texindy}
-
- local index_file
- local index_noext
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- for index_file in $index_files
- do
- index_noext=`noext "$index_file"`
- run tex \
- '\def\filename{{'"$index_noext"'}{idx}{4dx}{ind}}
- \input idxmake.4ht'
- run $MAKEINDEX -o $index_noext.ind $index_noext.4dx
- done
- ;;
-
- latex:*)
- if $TEXINDY --version >&6 2>&1; then
- run $TEXINDY $index_files
- else
- run $MAKEINDEX $index_files
- fi
- ;;
-
- texinfo:*)
- run $TEXINDEX $index_files
- ;;
- esac
-}
-
-
-# run_tex4ht ()
-# -------------
-# Run the last two phases of TeX4HT: tex4ht extracts the HTML from the
-# instrumented DVI file, and t4ht converts the figures and installs
-# the files when given -d.
-#
-# Because knowing exactly which files are created is complex (in
-# addition the names are not simple to compute), which makes it
-# difficult to install the output files in a second step, it is much
-# simpler to install directly the output files.
-run_tex4ht ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- : ${TEX4HT=tex4ht} ${T4HT=t4ht}
- run "$TEX4HT" "-f/$in_noext"
- # Do not remove the / after the destdir.
- run "$T4HT" "-d`destdir`/" "-f/$in_noext"
- ;;
- esac
-}
-
-
-# run_thumbpdf ()
-# ---------------
-run_thumbpdf ()
-{
- if test `out_lang_tex` = pdf \
- && test -r "$in_noext.log" \
- && grep 'thumbpdf\.sty' "$in_noext.log" >&6 2>&1; \
- then
- thumbpdf=${THUMBPDF:-thumbpdf}
- thumbcmd="$thumbpdf $in_dir/$in_noext"
- verbose "Running $thumbcmd ..."
- if $thumbcmd >&5; then
- run_tex
- else
- report "$thumbpdf exited with bad status." \
- "Ignoring its output."
- fi
- fi
-}
-
-
-# run_dvipdf FILE.dvi
-# -------------------
-# Convert FILE.dvi to FILE.pdf.
-run_dvipdf ()
-{
- # Find which dvi->pdf program is available.
- if test -z "$dvipdf"; then
- for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf;
- do
- if findprog $i; then
- dvipdf=$i
- fi
- done
- fi
- # These tools have varying interfaces, some 'input output', others
- # 'input -o output'. They all seem to accept 'input' only,
- # outputting using the expected file name.
- run $dvipdf "$1"
- if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
- error 1 "cannot find output file"
- fi
-}
-
-# run_tex_suite ()
-# ----------------
-# Run the TeX tools until a fix point is reached.
-run_tex_suite ()
-{
- # Move to the working directory.
- if $tidy; then
- verbose "cd $work_build"
- cd "$work_build" || exit 1
- fi
-
- # Count the number of cycles.
- local cycle=0
-
- while :; do
- # check for probably LaTeX loop (e.g. varioref)
- if test $cycle -eq "$max_iters"; then
- error 0 "Maximum of $max_iters cycles exceeded"
- break
- fi
-
- # report progress
- cycle=`expr $cycle + 1`
- verbose "Cycle $cycle for $command_line_filename"
-
- xref_files_save
-
- # We run bibtex first, because I can see reasons for the indexes
- # to change after bibtex is run, but I see no reason for the
- # converse.
- run_bibtex
- run_index
- run_core_conversion
-
- xref_files_changed || break
- done
-
- # If we were using thumbpdf and producing PDF, then run thumbpdf
- # and TeX one last time.
- run_thumbpdf
-
- # If we are using tex4ht, call it.
- run_tex4ht
-
- # Install the result if we didn't already (i.e., if the output is
- # dvipdf or ps).
- case $latex2html:$out_lang in
- *:dvipdf)
- run_dvipdf "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- *:ps)
- : {DVIPS=dvips}
- $DVIPS -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- esac
-
- cd_orig
-}
-
-## -------------------------------- ##
-## TeX processing auxiliary tools. ##
-## -------------------------------- ##
-
-
-# A sed script that preprocesses Texinfo sources in order to keep the
-# iftex sections only. We want to remove non TeX sections, and comment
-# (with `@c _texi2dvi') TeX sections so that makeinfo does not try to
-# parse them. Nevertheless, while commenting TeX sections, don't
-# comment @macro/@end macro so that makeinfo does propagate them.
-# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
-# (yet), makeinfo can't parse the TeX commands, so work around with sed.
-#
-# We assume that `@c _texi2dvi' starting a line is not present in the
-# document.
-#
-comment_iftex=\
-'/^@tex/,/^@end tex/{
- s/^/@c _texi2dvi/
-}
-/^@iftex/,/^@end iftex/{
- s/^/@c _texi2dvi/
- /^@c _texi2dvi@macro/,/^@c _texi2dvi@end macro/{
- s/^@c _texi2dvi//
- }
-}
-/^@ifnottex/,/^@end ifnottex/{
- s/^/@c (_texi2dvi)/
-}
-/^@ifinfo/,/^@end ifinfo/{
- /^@node/p
- /^@menu/,/^@end menu/p
- t
- s/^/@c (_texi2dvi)/
-}
-s/^@ifnotinfo/@c _texi2dvi@ifnotinfo/
-s/^@end ifnotinfo/@c _texi2dvi@end ifnotinfo/'
-
-# Uncommenting is simpler: remove any leading `@c texi2dvi'; repeated
-# copies can sneak in via macro invocations.
-uncomment_iftex='s/^@c _texi2dvi\(@c _texi2dvi\)*//'
-
-
-# run_makeinfo ()
-# ---------------
-# Expand macro commands in the original source file using Makeinfo.
-# Always use `end' footnote style, since the `separate' style
-# generates different output (arguably this is a bug in -E). Discard
-# main info output, the user asked to run TeX, not makeinfo.
-run_makeinfo ()
-{
- test $in_lang = texinfo \
- || return 0
-
- # Unless required by the user, makeinfo expansion is wanted only
- # if texinfo.tex is too old.
- if $expand; then
- makeinfo=${MAKEINFO:-makeinfo}
- else
- # Check if texinfo.tex performs macro expansion by looking for
- # its version. The version is a date of the form YEAR-MO-DA.
- # We don't need to use [0-9] to match the digits since anyway
- # the comparison with $txiprereq, a number, will fail with non
- # digits.
- # Run in a temporary directory to avoid leaving files.
- version_test_dir=$t2ddir/version_test
- ensure_dir "$version_test_dir"
- (
- cd "$version_test_dir"
- echo '\input texinfo.tex @bye' >txiversion.tex
- # Be sure that if tex wants to fail, it is not interactive:
- # close stdin.
- $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
- )
- if test $? != 0; then
- cat "$version_test_dir/txiversion.out"
- cat "$version_test_dir/txiversion.err" >&2
- error 1 "texinfo.tex appears to be broken, quitting."
- fi
- eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
- verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
- if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
- makeinfo=
- else
- makeinfo=${MAKEINFO:-makeinfo}
- fi
- # If TeX is preloaded, offer the user this convenience:
- if test "$txiformat" = Texinfo; then
- escape=@
- fi
- fi
-
- if test -n "$makeinfo"; then
- # in_src: the file with macros expanded.
- # Use the same basename to generate the same aux file names.
- work_src=$workdir/src
- ensure_dir "$work_src"
- in_src=$work_src/$in_base
- local miincludes
- miincludes=`list_prefix includes -I`
- verbose "Macro-expanding $command_line_filename to $in_src ..."
- # eval $makeinfo because it might be defined as something complex
- # (running missing) and then we end up with things like '"-I"',
- # and "-I" (including the quotes) is not an option name. This
- # happens with gettext 0.14.5, at least.
- sed "$comment_iftex" "$command_line_filename" \
- | eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
- -o /dev/null --macro-expand=- \
- | sed "$uncomment_iftex" >"$in_src"
- # Continue only if everything succeeded.
- if test $? -ne 0 \
- || test ! -r "$in_src"; then
- verbose "Expansion failed, ignored...";
- else
- in_input=$in_src
- fi
- fi
-}
-
-# insert_commands ()
-# ------------------
-# Used most commonly for @finalout, @smallbook, etc.
-insert_commands ()
-{
- if test -n "$textra"; then
- # _xtr. The file with the user's extra commands.
- work_xtr=$workdir/xtr
- in_xtr=$work_xtr/$in_base
- ensure_dir "$work_xtr"
- verbose "Inserting extra commands: $textra"
- local textra_cmd
- case $in_lang in
- latex) textra_cmd=1i;;
- texinfo) textra_cmd='/^@setfilename/a';;
- *) error 1 "internal error, unknown language: $in_lang";;
- esac
- sed "$textra_cmd\\
-$textra" "$in_input" >"$in_xtr"
- in_input=$in_xtr
- fi
-
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- # _tex4ht. The file with the added \usepackage{tex4ht}.
- work_tex4ht=$workdir/tex4ht
- in_tex4ht=$work_tex4ht/$in_base
- ensure_dir "$work_tex4ht"
- verbose "Inserting \\usepackage{tex4ht}"
- perl -pe 's<\\documentclass(?:\[.*\])?{.*}>
- <$&\\usepackage[xhtml]{tex4ht}>' \
- "$in_input" >"$in_tex4ht"
- in_input=$in_tex4ht
- ;;
- esac
-}
-
-# run_recode ()
-# -------------
-# If this is a Texinfo file with a specified input encoding, and
-# recode is available, then recode to plain 7 bit Texinfo.
-run_recode ()
-{
- local from
- local to
-
- if test $in_lang = texinfo; then
- pgm='s/^ *@documentencoding *\([^ ][^ ]*\) *$/\1/
- t found
- d
- :found
- q'
- encoding=`sed -e "$pgm" "$in_input"`
- if $recode && test -n "$encoding" && findprog recode; then
- if test -n "$recode_from"; then
- from=$recode_from
- to=$encoding
- else
- from=$encoding
- to=$texinfo
- fi
- verbose "Recoding from $from to $to."
- # _rcd. The Texinfo file recoded in 7bit.
- work_rcd=$workdir/recode
- in_rcd=$work_rcd/$in_base
- ensure_dir "$work_rcd"
- if recode "$encoding..$to" <"$in_input" >"$in_rcd" \
- && test -s "$in_rcd"; then
- in_input=$in_rcd
- else
- verbose "Recoding failed, using original input."
- fi
- fi
- fi
-}
-
-# compute_language FILENAME
-# -------------------------
-# Return the short string describing the language in which FILENAME
-# is written: `texinfo' or `latex'.
-compute_language ()
-{
- # If the user explicitly specified the language, use that.
- # Otherwise, if the first line is \input texinfo, assume it's texinfo.
- # Otherwise, guess from the file extension.
- if test -n "$set_language"; then
- echo $set_language
- elif sed 1q "$1" | grep 'input texinfo' >&6; then
- echo texinfo
- else
- # Get the type of the file (latex or texinfo) from the given language
- # we just guessed, or from the file extension if not set yet.
- case $1 in
- *.ltx | *.tex | *.drv | *.dtx) echo latex;;
- *) echo texinfo;;
- esac
- fi
-}
-
-
-# run_hevea (MODE)
-# ----------------
-# Convert to HTML/INFO/TEXT.
-#
-# Don't pass `-noiso' to hevea: it's useless in HTML since anyway the
-# charset is set to latin1, and troublesome in other modes since
-# accented characters loose their accents.
-#
-# Don't pass `-o DEST' to hevea because in that case it leaves all its
-# auxiliary files there too... Too bad, because it means we will need
-# to handle images some day.
-run_hevea ()
-{
- local hevea="${HEVEA:-hevea}"
- local run_hevea="$hevea"
-
- case $1 in
- html) ;;
- text|info) run_hevea="$run_hevea -$1";;
- *) error 1 "run_hevea: invalid argument: $1";;
- esac
-
- # Compiling to the tmp directory enables to preserve a previous
- # successful compilation.
- run_hevea="$run_hevea -fix -O -o '$out_base'"
- run_hevea="$run_hevea `list_prefix includes -I` -I '$orig_pwd' "
- run_hevea="$run_hevea '$in_input'"
-
- if $debug; then
- run_hevea="$run_hevea -v -v"
- fi
-
- verbose "running $run_hevea"
- if eval "$run_hevea" >&5; then
- # hevea leaves trailing white spaces, this is annoying.
- case $1 in text|info)
- perl -pi -e 's/[ \t]+$//g' "$out_base"*;;
- esac
- case $1 in
- html|text) move_to_dest "$out_base";;
- info) # There can be foo.info-1, foo.info-2 etc.
- move_to_dest "$out_base"*;;
- esac
- else
- error 1 "$hevea exited with bad status, quitting."
- fi
-}
-
-
-# run_core_conversion ()
-# ----------------------
-# Run the TeX (or HeVeA).
-run_core_conversion ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- *:dvi|*:pdf|latex:tex4ht:html)
- run_tex;;
- latex:*:html|latex:*:text|latex:*:info)
- run_hevea $out_lang;;
- *)
- error 1 "invalid input/output combination: $in_lang/$out_lang";;
- esac
-}
-
-
-# compile ()
-# ----------
-# Run the full compilation chain, from pre-processing to installation
-# of the output at its expected location.
-compile ()
-{
- # Source file might include additional sources.
- # We want `.:$orig_pwd' before anything else. (We'll add `.:' later
- # after all other directories have been turned into absolute paths.)
- # `.' goes first to ensure that any old .aux, .cps,
- # etc. files in ${directory} don't get used in preference to fresher
- # files in `.'. Include orig_pwd in case we are in clean build mode, where
- # we have cd'd to a temp directory.
- common="$orig_pwd$path_sep$in_dir$path_sep"
- #
- # If we have any includes, put those at the end.
- # Keep a final path_sep to get the default (system) TeX directories included.
- txincludes=`list_infix includes $path_sep`
- test -n "$txincludes" && common="$common$txincludes$path_sep"
- #
- for var in $tex_envvars; do
- eval val="\$common\$${var}_orig"
- # Convert relative paths to absolute paths, so we can run in another
- # directory (e.g., in clean build mode, or during the macro-support
- # detection). ".:" is added here.
- val=`absolute_filenames "$val"`
- eval $var="\"$val\""
- export $var
- eval verbose \"$var=\'\$${var}\'\"
- done
-
- # --expand
- run_makeinfo
-
- # --command, --texinfo
- insert_commands
-
- # --recode
- run_recode
-
- # Run until a fix point is reached.
- run_tex_suite
-}
-
-
-# remove FILES
-# ------------
-remove ()
-{
- verbose "Removing" "$@"
- rm -rf "$@"
-}
-
-
-# mostly_clean
-# ------------
-# Remove auxiliary files and directories. Changes the current directory.
-mostly_clean ()
-{
- cd_orig
- set X "$t2ddir"
- shift
- $tidy || {
- local log="$work_build/$in_noext.log"
- set X ${1+"$@"} "$log" `generated_files_get "$work_build/$in_noext"`
- shift
- }
- remove ${1+"$@"}
-}
-
-
-# cleanup ()
-# ----------
-# Remove what should be removed according to options.
-# Called at the end of each compilation cycle, and at the end of
-# the script. Changes the current directory.
-cleanup ()
-{
- case $build_mode in
- local) cd_orig; remove "$t2ddir";;
- clean) mostly_clean;;
- tidy) ;;
- esac
-}
-
-
-
-## ---------------------- ##
-## Command line parsing. ##
-## ---------------------- ##
-
-# Push a token among the arguments that will be used to notice when we
-# ended options/arguments parsing.
-# Use "set dummy ...; shift" rather than 'set - ..." because on
-# Solaris set - turns off set -x (but keeps set -e).
-# Use ${1+"$@"} rather than "$@" because Digital Unix and Ultrix 4.3
-# still expand "$@" to a single argument (the empty string) rather
-# than nothing at all.
-arg_sep="$$--$$"
-set dummy ${1+"$@"} "$arg_sep"; shift
-
-#
-# Parse command line arguments.
-while test x"$1" != x"$arg_sep"; do
-
- # Handle --option=value by splitting apart and putting back on argv.
- case "$1" in
- --*=*)
- opt=`echo "$1" | sed -e 's/=.*//'`
- val=`echo "$1" | sed -e 's/[^=]*=//'`
- shift
- set dummy "$opt" "$val" ${1+"$@"}; shift
- ;;
- esac
-
- # This recognizes --quark as --quiet. Oh well.
- case "$1" in
- -@ ) escape=@;;
- -~ ) catcode_special=false;;
- # Silently and without documentation accept -b and --b[atch] as synonyms.
- -b | --batch) batch=true;;
- --build) shift; build_mode=$1;;
- --build-dir) shift; build_dir=$1; build_mode=tidy;;
- -c | --clean) build_mode=clean;;
- -D | --debug) debug=true;;
- -e | -E | --expand) expand=true;;
- -h | --help) usage;;
- -I) shift; list_concat_dirs includes "$1";;
- -l | --lang | --language) shift; set_language=$1;;
- --mostly-clean) action=mostly-clean;;
- --no-line-error) line_error=false;;
- --max-iterations) shift; max_iters=$1;;
- -o | --out | --output)
- shift
- # Make it absolute, just in case we also have --clean, or whatever.
- oname=`absolute "$1"`;;
-
- # Output formats.
- -O|--output-format) shift; out_lang_set "$1";;
- --dvi|--dvipdf|--html|--info|--pdf|--ps|--text)
- out_lang_set `echo "x$1" | sed 's/^x--//'`;;
-
- -p) out_lang_set pdf;;
- -q | -s | --quiet | --silent) quiet=true; batch=true;;
- -r | --recode) recode=true;;
- --recode-from) shift; recode=true; recode_from="$1";;
- --src-specials) src_specials=--src-specials;;
- --tex4ht) latex2html=tex4ht;;
- -t | --texinfo | --command ) shift; textra="$textra\\
-"`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
- --translate-file ) shift; translate_file="$1";;
- --tidy) build_mode=tidy;;
- -v | --vers*) version;;
- -V | --verb*) verb=true;;
- --) # What remains are not options.
- shift
- while test x"$1" != x"$arg_sep"; do
- set dummy ${1+"$@"} "$1"; shift
- shift
- done
- break;;
- -*)
- error 1 "Unknown or ambiguous option \`$1'." \
- "Try \`--help' for more information."
- ;;
- *) set dummy ${1+"$@"} "$1"; shift;;
- esac
- shift
-done
-# Pop the token
-shift
-
-# $tidy: compile in a t2d directory.
-# $clean: remove all the aux files.
-case $build_mode in
- local) clean=false; tidy=false;;
- tidy) clean=false; tidy=true;;
- clean) clean=true; tidy=true;;
- *) error 1 "invalid build mode: $build_mode";;
-esac
-
-# Interpret remaining command line args as filenames.
-case $# in
- 0)
- error 2 "Missing file arguments." "Try \`--help' for more information."
- ;;
- 1) ;;
- *)
- if test -n "$oname"; then
- error 2 "Can't use option \`--output' with more than one argument."
- fi
- ;;
-esac
-
-
-# We can't do much without tex.
-#
-if findprog ${TEX:-tex}; then :; else cat <<EOM
-You don't have a working TeX binary (${TEX:-tex}) installed anywhere in
-your PATH, and texi2dvi cannot proceed without one. If you want to use
-this script, you'll need to install TeX (if you don't have it) or change
-your PATH or TEX environment variable (if you do). See the --help
-output for more details.
-
-For information about obtaining TeX, please see http://www.tug.org. If
-you happen to be using Debian, you can get it with this command:
- apt-get install tetex-bin
-EOM
- exit 1
-fi
-
-
-# We want to use etex (or pdftex) if they are available, and the user
-# didn't explicitly specify. We don't check for elatex and pdfelatex
-# because (as of 2003), the LaTeX team has asked that new distributions
-# use etex by default anyway.
-#
-# End up with the TEX and PDFTEX variables set to what we are going to use.
-if test -z "$TEX"; then
- if findprog etex; then TEX=etex; else TEX=tex; fi
-fi
-#
-if test -z "$PDFTEX"; then
- if findprog pdfetex; then PDFTEX=pdfetex; else PDFTEX=pdftex; fi
-fi
-
-
-# File descriptor usage:
-# 0 standard input
-# 1 standard output (--verbose messages)
-# 2 standard error
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 tools output (turned off by --quiet)
-# 6 tracing/debugging (set -x output, etc.)
-
-
-# Main tools' output (TeX, etc.) that TeX users are used to seeing.
-#
-# If quiet, discard, else redirect to the message flow.
-if $quiet; then
- exec 5>/dev/null
-else
- exec 5>&1
-fi
-
-
-# Enable tracing, and auxiliary tools output.
-#
-# Should be used where you'd typically use /dev/null to throw output
-# away. But sometimes it is convenient to see that output (e.g., from
-# a grep) to aid debugging. Especially debugging at distance, via the
-# user.
-if $debug; then
- exec 6>&1
- set -x
-else
- exec 6>/dev/null
-fi
-
-#
-
-# input_file_name_decode
-# ----------------------
-# Decode COMMAND_LINE_FILENAME, and compute:
-# - COMMAND_LINE_FILENAME clean of TeX commands
-# - IN_DIR
-# The directory to the input file, possibly absolute if needed.
-# - IN_DIR_ABS
-# The absolute directory of the input file.
-# - IN_BASE
-# The input file base name (no directory part).
-# - IN_NOEXT
-# The input file name without extensions (nor directory part).
-# - IN_INPUT
-# Defaults to COMMAND_LINE_FILENAME, but might change if the
-# input is preprocessed (recode etc.). With directory, possibly absolute.
-input_file_name_decode ()
-{
- # See if we are run from within AUC-Tex, in which case we are
- # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
- case $command_line_filename in
- *\\nonstopmode*)
- batch=true;;
- esac
- case $command_line_filename in
- *\\input{*}*)
- # Let AUC-TeX error parser deal with line numbers.
- line_error=false
- command_line_filename=`\
- expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
- ;;
- esac
-
- # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
- # prepend `./' in order to avoid that the tools take it as an option.
- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
- || command_line_filename="./$command_line_filename"
-
- # See if the file exists. If it doesn't we're in trouble since, even
- # though the user may be able to reenter a valid filename at the tex
- # prompt (assuming they're attending the terminal), this script won't
- # be able to find the right xref files and so forth.
- test -r "$command_line_filename" ||
- error 1 "cannot read $command_line_filename, skipping."
-
- # Get the name of the current directory.
- in_dir=`func_dirname "$command_line_filename"`
- in_dir_abs=`absolute "$in_dir"`
- # In a clean build, we `cd', so get an absolute file name.
- if $tidy; then
- in_dir=$in_dir_abs
- fi
-
- # Strip directory part but leave extension.
- in_base=`basename "$command_line_filename"`
- # Strip extension.
- in_noext=`noext "$in_base"`
-
- # The normalized file name to compile. Must always point to the
- # file to actually compile (in case of recoding, macro-expansion etc.).
- in_input=$in_dir/$in_base
-
-
- # Compute the output file name.
- if test x"$oname" != x; then
- out_name=$oname
- else
- out_name=$in_noext.`out_lang_ext`
- fi
- out_dir=`func_dirname "$out_name"`
- out_dir_abs=`absolute "$out_dir"`
- out_base=`basename "$out_name"`
- out_noext=`noext "$out_base"`
-}
-
-
-## -------------- ##
-## TeXify files. ##
-## -------------- ##
-
-for command_line_filename
-do
- verbose "Processing $command_line_filename ..."
-
- input_file_name_decode
-
- # `texinfo' or `latex'?
- in_lang=`compute_language "$command_line_filename"`
-
- # An auxiliary directory used for all the auxiliary tasks involved
- # in compiling this document.
- case $build_dir in
- '' | . ) t2ddir=$out_noext.t2d ;;
- *) # Avoid collisions between multiple occurrences of the same
- # file, so depend on the output path. Remove leading `./',
- # at least to avoid creating a file starting with `.!', i.e.,
- # an invisible file. The sed expression is fragile if the cwd
- # has active characters. Transform / into ! so that we don't
- # need `mkdir -p'. It might be something to reconsider.
- t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
- sed "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
- esac
- # Remove it at exit if clean mode.
- trap "cleanup" 0 1 2 15
-
- ensure_dir "$build_dir" "$t2ddir"
-
- # We will change directory, better work with an absolute path...
- t2ddir=`absolute "$t2ddir"`
- # Sometimes there are incompatibilities between auxiliary files for
- # DVI and PDF. The contents can also change whether we work on PDF
- # and/or DVI. So keep separate spaces for each.
- workdir=$t2ddir/`out_lang_tex`
- ensure_dir "$workdir"
-
- # _build. In a tidy build, where the auxiliary files are output.
- if $tidy; then
- work_build=$workdir/build
- else
- work_build=.
- fi
-
- # _bak. Copies of the previous auxiliary files (another round is
- # run if they differ from the new ones).
- work_bak=$workdir/bak
-
- # Make those directories.
- ensure_dir "$work_build" "$work_bak"
-
- case $action in
- compile)
- # Compile the document.
- compile
- cleanup
- ;;
-
- mostly-clean)
- mostly_clean
- ;;
- esac
-done
-
-verbose "done."
-exit 0 # exit successfully, not however we ended the loop.
diff --git a/configure.ac b/configure.ac
index 074672f..8d281ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,6 @@ AC_PREREQ([2.61])
AC_INIT([Olena], [1.0a], [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])
@@ -36,125 +33,14 @@ AC_CONFIG_FILES([build-aux/Makefile])
# Automake.
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
-# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
- [Package Full name.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
- [Bug report address.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_STRING], ["$PACKAGE_STRING"],
- [Full name and version.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"],
- [Package Version.])
-
-## --------------------- ##
-## C++ compiler set up. ##
-## --------------------- ##
-
-# If the user doesn't provide any CXXFLAGS, prevent Autoconf from
-# settings its own default ones (e.g., `-g -O2' for g++).
-if test ! ${CXXFLAGS+set}; then
- CXXFLAGS=""
-fi
-
-# Look for a C++ compiler.
-AC_LANG([C++])
-AC_PROG_CXX
-
-# Set `ICPC' to `yes' if the Intel C++ compiler is used.
-test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes
-
-# GNU C++ compiler setup.
-if test "$GXX" = yes; then
- # Speed up compiling times.
- CXXFLAGS="$CXXFLAGS -pipe"
-
- # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
- # a high optimization level (`-O3') and without
- # `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
- # Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
- #
- # So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
- # to `-fno-strict-aliasing'.
- if $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then
- STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing
- fi
-fi
-AC_SUBST([STRICT_ALIASING_CXXFLAGS])
-
-
-# Adjusting warning options according to compilers.
-AC_ARG_VAR([WARNINGS_CXXFLAGS], [C++ compiler warning flags])
-case "$CXX" in
- # Intel compiler
- *icpc*)
- WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418"
- ;;
- *)
- WARNINGS_CXXFLAGS="-Wall -W"
- ;;
-esac
-
-
-# ------------------------------ #
-# C++ compiler flags for tests. #
-# ------------------------------ #
-
-# FIXME: We might want to write an Autoconf macro to factor this.
-
-# Standard flags for tests.
-AC_ARG_VAR([TESTS_CXXFLAGS], [C++ compiler flags for tests])
-# We want no optimization for the tests (it slows down compiling
-# times), and debugging information.
-if test -z "$TESTS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for complex tests.
-AC_ARG_VAR([TESTS_CXXFLAGS_SPEED],
- [C++ compiler optimization flags for (complex) tests])
-# We want optimization for complex tests, and keep debugging flags
-# (still useful).
-if test -z "$TESTS_CXXFLAGS_SPEED"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for tests with with all debugging features turned on.
-AC_ARG_VAR([TESTS_CXXFLAGS_DEBUG], [C++ compiler debug flags])
-# We want no optimization for the tests (it slows down compiling
-# times), and a lot of debugging features.
-# * GNU C++ Library Debug Mode:
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html
-# * GNU C++ Library Compile Time Checks (a.k.a. concept checking):
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch29.html
-if test -z "$TESTS_CXXFLAGS_DEBUG"; then
- if test "$GXX" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -ggdb $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- elif test "$ICPC" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -g $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- fi
-fi
+AC_CONFIG_FILES([Makefile])
## ------------------------------ ##
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (Swilena, Scribo, etc). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -163,91 +49,19 @@ fi
AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
- enable_trimesh=yes
enable_swilena=yes
dnl<<lrde
enable_scribo=yes
dnl>>
- enable_apps=yes
- enable_tools=yes
fi])
-## ------------------ ##
-## Libraries set up. ##
-## ------------------ ##
-
-# Use Libtool.
-# To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used.
-AC_PROG_LIBTOOL
-
-# Check for Darwin.
-AC_CANONICAL_HOST
-AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
-
-
-## -------------------- ##
-## External libraries. ##
-## -------------------- ##
-
-# ------- #
-# Boost. #
-# ------- #
-
-BOOST_TUPLE
-AM_CONDITIONAL([HAVE_BOOST_TUPLE],
- [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes])
-
-# ----------------- #
-# CFITSIO library. #
-# ----------------- #
-
-OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio])
-
-# ---------- #
-# Magick++. #
-# ---------- #
-
-OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx],
- [MAGICKXX], [], [ImageMagick++])
-
-# ---- #
-# Qt. #
-# ---- #
-
-AT_WITH_QT([xml], [], [], [:], [oln_have_qt=yes])
-if test x$oln_have_qt = xyes; then
- AT_REQUIRE_QT_VERSION([4],
- AC_MSG_WARN([Qt-dependent programs will be disabled.]),
- oln_have_expected_qt_version=yes)
-fi
-AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes])
-
-# -------------- #
-# TIFF library. #
-# -------------- #
-
-OLN_WITH_LIB([TIFF], [tiff.h], [tiff])
-
-# --------------------------------- #
-# GDCM library (Grassroots DiCom). #
-# --------------------------------- #
-
-OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
- [GDCM],
- m4_do([-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF],
- [ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
- [ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+## -------- ##
+## Milena. ##
+## -------- ##
-AC_ARG_ENABLE([trimesh],
- [AS_HELP_STRING([--enable-trimesh],
- [build the (bundled) trimesh2 library])])
-AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
+# Milena is always enabled.
+AC_CONFIG_SUBDIRS([milena])
## --------- ##
@@ -274,341 +88,4 @@ AC_CONFIG_SUBDIRS([scribo])
dnl>>
-## --------------- ##
-## Configuration. ##
-## --------------- ##
-
-# Ask for config.h creation.
-AC_CONFIG_HEADERS([config.h])
-
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
-# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
-
-# Ask for the Makefile creations.
-AC_CONFIG_FILES([
- Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
-])
-
-
-## ------- ##
-## Tests. ##
-## ------- ##
-
-# Ask for the creation of a milena/tests/data.hh, used to access to
-# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
-
-# Ask for the creation of tests' Makefiles.
-AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- 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/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
-])
-
-dnl<<lrde
-AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
-])
-dnl>>
-
-
-## -------------- ##
-## Applications. ##
-## -------------- ##
-
-# Ask for the creation of a milena/apps/data.hh, used to access to
-# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
-
-AC_ARG_ENABLE([apps],
- [AS_HELP_STRING([--enable-apps],
- [enable application])])
-AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
-
-# Ask for the creation of applications' Makefiles.
-AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
-])
-
-# Configure tests.
-# FIXME: Consider using `sed' instead of `configure' to create these
-# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
-
-# Flags for apps.
-AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
-# We want fast binaries for apps.
-if test -z "$APPS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-## ------- ##
-## Tools. ##
-## ------- ##
-
-AC_ARG_ENABLE([tools],
- [AS_HELP_STRING([--enable-tools], [enable tools])])
-AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
-
-# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
-
-# Flags for tools.
-AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
-# We want fast binaries for tools.
-if test -z "$TOOLS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-
-## ----------------- ##
-## Verbose display. ##
-## ----------------- ##
-
-# Do not print this information by default, since `configure' outputs
-# should be kept short. Longer explanations are always available in
-# config.log.
-
-AC_ARG_ENABLE([verbose],
- [AS_HELP_STRING([--enable-verbose], [enable verbose display])],
- [if test "x$enable_verbose" != xno; then
- AC_MSG_RESULT([
--------------------------------------------------------------------------------
-Configuration summary.
-
-
-Host system type: $host
-Build system type: $build
-
-================
-| Dependencies |
-================
-
-
- Option Enabled and available
--------------------------------------------------------------------------------
-Boost Tuple --with-boost=@<:@=DIR@:>@ $oln_have_boost_tuple
-CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
-GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
-Magick++ --with-magickxx $oln_have_magickxx
-Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
-TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
--------------------------------------------------------------------------------
-
-
-
-
-=============
-| Utilities |
-=============
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Apps --enable-apps $enable_apps
-Tools --enable-tools $enable_tools
--------------------------------------------------------------------------------
-
-
-
-Options used to compile and link:
- PREFIX = $PREFIX_DIR
- EXEC-PREFIX = $EXEC_PREFIX_DIR
- VERSION = $PACKAGE_VERSION
- CC = $CC
- CFLAGS = $CFLAGS
- CPPFLAGS = $MAGICK_CPPFLAGS
- DEFS = $DEFS
- LDFLAGS = $LDFLAGS
- LIBS = $MAGICK_LIBS
- CXX = $CXX
- CXXFLAGS = $CXXFLAGS
- PKG_CONFIG = $PKG_CONFIG
- QT_PATH = $QT_PATH
- QMAKE = $QMAKE
- MOC = $MOC
- UIC = $UIC
- RCC = $RCC
- BOOST_ROOT = $BOOST_ROOT
- MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS
- MAGICKXX_LIBS = $MAGICKXX_LDFLAGS
- APPS_CXXFLAGS = $APPS_CXXFLAGS
- TOOLS_CXXFLAGS = $TOOLS_CXXFLAGS
-
-
-
-*******************************************************************************
-Olena is configured as stated above. Please verify that this configuration
-matches your expectations.
-
-Then, type 'make' to build Olena and 'make install' to install it on
-your system.
-])
-fi])
-
-
-## -------- ##
-## Output. ##
-## -------- ##
-
AC_OUTPUT
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-536-gdad2f44 Have Milena be in charge of its own configuration and distribution.
by Roland Levillain
* configure.ac: Remove parts now handled by Milena's configure.ac.
* Makefile.am (ACLOCAL_AMFLAGS): Remove.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
Remove all Milena files.
(dist-hook): Do not regen Milena's unit tests, as Milena itself is
now in charge of this.
* NEWS, README: Update.
* build-aux/tex.mk,
* build-aux/texi2dvi,
Remove.
* build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
---
.gitignore | 3 -
ChangeLog | 16 +
Makefile.am | 67 +--
NEWS | 6 +-
README | 46 +-
build-aux/Makefile.am | 6 +-
build-aux/tex.mk | 47 --
build-aux/texi2dvi | 1959 -------------------------------------------------
configure.ac | 537 +-------------
9 files changed, 41 insertions(+), 2646 deletions(-)
delete mode 100644 build-aux/tex.mk
delete mode 100755 build-aux/texi2dvi
diff --git a/.gitignore b/.gitignore
index 60e1d08..4bc335c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,9 +19,6 @@ Makefile
/autoscan.log
/config
/config.cache*
-/config.h
-/config.h?in*
-/config.hin
/config.log*
/config.status*
/configure
diff --git a/ChangeLog b/ChangeLog
index 16f6d3b..95f6f93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Have Milena be in charge of its own configuration and distribution.
+
+ * configure.ac: Remove parts now handled by Milena's configure.ac.
+ * Makefile.am (ACLOCAL_AMFLAGS): Remove.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES):
+ Remove all Milena files.
+ (dist-hook): Do not regen Milena's unit tests, as Milena itself is
+ now in charge of this.
+ * NEWS, README: Update.
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi,
+ Remove.
+ * build-aux/Makefile.am (EXTRA_DIST): Remove texi2dvi.
+
2010-10-26 Roland Levillain <roland(a)lrde.epita.fr>
Move trimesh2 into Milena.
diff --git a/Makefile.am b/Makefile.am
index 81168a9..483ab5b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,6 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-ACLOCAL_AMFLAGS = -I m4
-
SUBDIRS = build-aux milena
if ENABLE_SWILENA
@@ -47,76 +45,19 @@ REGEN_SUBDIRS += milena scribo
LRDE_STRIPPED_DIST_FILES = \
$(distdir)/Makefile.am \
- $(distdir)/configure.ac \
- $(distdir)/milena/mln/accu/math/all.hh \
- $(distdir)/milena/mln/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/all.hh \
- $(distdir)/milena/mln/core/image/vmorph/fun_image.hh \
- $(distdir)/milena/mln/data/all.hh \
- $(distdir)/milena/mln/essential/routine.hh \
- $(distdir)/milena/mln/fun/all.hh \
- $(distdir)/milena/mln/fun/essential.hh \
- $(distdir)/milena/mln/fun/v2v/all.hh \
- $(distdir)/milena/mln/fun/v2v/essential.hh \
- $(distdir)/milena/mln/linear/all.hh \
- $(distdir)/milena/mln/trait/all.hh \
- $(distdir)/milena/mln/trait/ch_value.hh \
- $(distdir)/milena/mln/value/all.hh \
- $(distdir)/milena/mln/value/essential.hh \
- $(distdir)/milena/tests/Makefile.am \
- $(distdir)/milena/tests/convert/Makefile.am \
- $(distdir)/milena/tests/extract/Makefile.am \
- $(distdir)/milena/tests/fun/v2v/Makefile.am \
- $(distdir)/milena/tests/linear/Makefile.am \
- $(distdir)/milena/tests/linear/gaussian/Makefile.am \
- $(distdir)/milena/tests/registration/Makefile.am \
- $(distdir)/milena/tests/trait/ch_value.cc \
- $(distdir)/milena/tests/value/Makefile.am
+ $(distdir)/configure.ac
LRDE_NODIST_FILES = \
- $(distdir)/milena/tests/convert/to_hsl.cc \
- $(distdir)/milena/tests/extract/blue.cc \
- $(distdir)/milena/tests/extract/green.cc \
- $(distdir)/milena/tests/extract/hue.cc \
- $(distdir)/milena/tests/extract/lum.cc \
- $(distdir)/milena/tests/extract/red.cc \
- $(distdir)/milena/tests/extract/sat.cc \
- $(distdir)/milena/tests/fun/v2v/component.cc \
- $(distdir)/milena/tests/fun/v2v/hsl_to_rgb.cc \
- $(distdir)/milena/tests/fun/v2v/rgb_to_hsl.cc \
- $(distdir)/milena/tests/linear/gaussian.cc \
- $(distdir)/milena/tests/linear/gaussian/filter.cc \
- $(distdir)/milena/tests/registration/registration.cc \
- $(distdir)/milena/tests/value/stack.cc \
$(distdir)/scribo
-## FIXME: Running `build-aux/build_unit_test.sh' just to update
-## `milena/tests/unit_test/unit-tests.mk' is overkill:
-##
-## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
-## => We should just regen `unit-tests.mk', not the `.cc' files.
-##
-## 2. It visits (almost) all the directories and files under
-## milena/mln/ (which admittedly a smaller issue compared to the
-## previous one)
-## => Prune `unit-tests.mk' instead of regenerating it. The
-## simplest solution is probably to equip `unit-tests.mk' in the
-## first place with `<<lrde'/`>>' tags, then prune it with
-## dist-strip.
-##
-
# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files.
dist-hook:
for f in $(LRDE_STRIPPED_DIST_FILES); do \
$(top_srcdir)/build-aux/strip-lrde $$f; \
done; \
- rm -rf $(LRDE_NODIST_FILES) && \
- $(top_srcdir)/build-aux/build_unit_test.sh \
- $(distdir)/milena/mln \
- $(distdir)/milena/tests/unit_test \
- $(top_srcdir)/milena/tests/unit_test/disabled_tests \
- mln \
- && \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && \
( \
cd $(distdir); \
set -evx; \
diff --git a/NEWS b/NEWS
index 36bf98f..d8ac176 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,9 @@
* Olena 1.0a
+ * Starting with Olena 1.1, Milena, Swilena and Scribo are
+ independent components of the project, distributed together
+ with the Olena package and as standalone packages.
+
* Olena 1.0 July 14, 2009
@@ -352,7 +356,7 @@ End:
----
-Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009 EPITA Research and
+Copyright (C) 2001, 2002, 2003, 2004, 2007, 2009, 2010 EPITA Research and
Development Laboratory (LRDE)
This file is part of Olena.
diff --git a/README b/README
index cc49a02..6400941 100644
--- a/README
+++ b/README
@@ -336,7 +336,7 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
+ * the documentation in `/usr/local/share/doc/olena/`.
And optionally:
@@ -368,42 +368,17 @@ build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
m4
Extra Autoconf macros.
milena
+ Milena C++ library.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
-
- tools
- Example tools.
-
- mesh
- Some 3D meshes, mostly used for test purpose.
-
- img
- Some (2D) images, mostly used for test purpose.
-
- demos
- Demos of Milena.
+scribo
+ Olena-Scribo project.
swilena
-
- python
- Some Python bindings for Milena.
+ Swilena project.
===================
@@ -415,10 +390,10 @@ Olena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.0, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.0.1
=========================== =============================================
@@ -433,7 +408,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -457,11 +432,6 @@ There are other sources of interest in the distribution.
- Headline news about the project can be found in the file ``NEWS`` at
the root of the source tree.
-- The library reference HTML documentation, generated by Doxygen_, is
- located in ``doc/user/html/``.
-
-.. _Doxygen: http://www.doxygen.org
-
License
=======
diff --git a/build-aux/Makefile.am b/build-aux/Makefile.am
index 0e1ad0f..7fa77cb 100644
--- a/build-aux/Makefile.am
+++ b/build-aux/Makefile.am
@@ -15,9 +15,5 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# texi2dvi: produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# Part of the Texinfo project (http://www.gnu.org/software/texinfo/).
-EXTRA_DIST = texi2dvi
-
# File generators.
-EXTRA_DIST += generate_dist_headers.sh build_unit_test.sh
+EXTRA_DIST = generate_dist_headers.sh build_unit_test.sh
diff --git a/build-aux/tex.mk b/build-aux/tex.mk
deleted file mode 100644
index da35475..0000000
--- a/build-aux/tex.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-## tex.mk -*- Makefile-Automake -*-
-
-## A small subset of LRDE's share/make/tex.mk.
-
-## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
-##
-## This file is part of Olena.
-##
-## Olena is free software: you can redistribute it and/or modify it under
-## the terms of the GNU General Public License as published by the Free
-## Software Foundation, version 2 of the License.
-##
-## Olena is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-
-build_aux_dir = $(top_srcdir)/build-aux
-
-TEXI2DVI = $(build_aux_dir)/texi2dvi
-TEXI2DVI_FLAGS = --tidy --build-dir=tmp.t2d --batch
-
-
-TEXI2PDF = $(TEXI2DVI) --pdf
-TEXI2PDF_FLAGS = $(TEXI2DVI_FLAGS)
-
-# 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
-
-.tex.pdf:
- $(TEXI2PDF) $(TEXI2PDF_FLAGS) -o $@ $<
-
-tex-mostlyclean:
- rm -rf tmp.t2d
-.PHONY: tex-mostlyclean
-# mostlyclean-local is an Automake special target.
-mostlyclean-local: tex-mostlyclean
-.PHONY: mostlyclean-local
diff --git a/build-aux/texi2dvi b/build-aux/texi2dvi
deleted file mode 100755
index fce73b9..0000000
--- a/build-aux/texi2dvi
+++ /dev/null
@@ -1,1959 +0,0 @@
-#! /bin/sh
-# texi2dvi --- produce DVI (or PDF) files from Texinfo (or (La)TeX) sources.
-# $Id: texi2dvi,v 1.157 2010/02/09 18:37:08 karl Exp $
-#
-# Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-# 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Noah Friedman.
-#
-# Please send bug reports, etc. to bug-texinfo(a)gnu.org.
-# If possible, please send a copy of the output of the script called with
-# the `--debug' option when making a bug report.
-
-test -f /bin/ksh && test -z "$RUNNING_KSH" \
- && { UNAMES=`uname -s`; test "x$UNAMES" = xULTRIX; } 2>/dev/null \
- && { RUNNING_KSH=true; export RUNNING_KSH; exec /bin/ksh $0 ${1+"$@"}; }
-unset RUNNING_KSH
-
-# No failure shall remain unpunished.
-set -e
-
-# This string is expanded automatically when this file is checked out.
-rcs_revision='$Revision: 1.157 $'
-rcs_version=`set - $rcs_revision; echo $2`
-program=`echo $0 | sed -e 's!.*/!!'`
-
-build_mode=${TEXI2DVI_BUILD_MODE:-local}
-build_dir=${TEXI2DVI_BUILD_DIRECTORY:-.}
-
-# Initialize variables for option overriding and otherwise.
-# Don't use `unset' since old bourne shells don't have this command.
-# Instead, assign them an empty value.
-action=compile
-batch=false # interact normally
-catcode_special=maybe
-debug=false
-escape="\\"
-expand=false # true for expansion via makeinfo
-includes=
-line_error=true # pass --file-line-error to TeX
-max_iters=-1 # keep going forever
-oname= # --output
-out_lang=dvi
-quiet=false # let the tools' message be displayed
-recode=false
-set_language=
-src_specials=
-latex2html=hevea # or set to tex4ht
-textra= # Extra TeX commands to insert in the input file.
-txiprereq=19990129 # minimum texinfo.tex version with macro expansion
-verb=false # true for verbose mode
-translate_file= # name of charset translation file
-recode_from= # if not empty, recode from this encoding to @documentencoding
-
-orig_pwd=`pwd`
-
-# We have to initialize IFS to space tab newline since we save and
-# restore IFS and apparently POSIX allows stupid/broken behavior with
-# empty-but-set IFS.
-# http://lists.gnu.org/archive/html/automake-patches/2006-05/msg00008.html
-# We need space, tab and new line, in precisely that order. And don't leave
-# trailing blanks.
-space=' '
-tab=' '
-newline='
-'
-IFS="$space$tab$newline"
-
-# In case someone pedantic insists on using grep -E.
-: ${EGREP=egrep}
-
-# Systems which define $COMSPEC or $ComSpec use semicolons to separate
-# directories in TEXINPUTS -- except for Cygwin et al., where COMSPEC
-# might be inherited, but : is used.
-if test -n "$COMSPEC$ComSpec" \
- && uname | $EGREP -iv 'cygwin|mingw|djgpp' >/dev/null; then
- path_sep=";"
-else
- path_sep=":"
-fi
-
-# Pacify verbose cds.
-CDPATH=${ZSH_VERSION+.}$path_sep
-
-# If $TEX is set to a directory, don't use it.
-test -n "$TEX" && test -d "$TEX" && unset TEX
-
-#
-## --------------------- ##
-## Auxiliary functions. ##
-## --------------------- ##
-
-# In case `local' is not supported by the shell, provide a function
-# that simulates it by simply performing the assignments. This means
-# that we must not expect `local' to work, i.e., we must not (i) rely
-# on it during recursion, and (ii) have two local declarations of the
-# same variable. (ii) is easy to check statically, and our test suite
-# does make sure there is never twice a static local declaration of a
-# variable. (i) cannot be checked easily, so just be careful.
-#
-# Note that since we might use a function simulating `local', we can
-# no longer rely on the fact that no IFS-splitting is performed. So,
-# while
-#
-# foo=$bar
-#
-# is fine (no IFS-splitting), never write
-#
-# local foo=$bar
-#
-# but rather
-#
-# local foo="$bar"
-(
- foo=bar
- test_local () {
- local foo=foo
- }
- test_local
- test $foo = bar
-) || local () {
- case $1 in
- *=*) eval "$1";;
- esac
-}
-
-
-# cd_orig
-# -------
-# Return to the original directory.
-cd_orig ()
-{
- # In case $orig_pwd is on a different drive (for DOS).
- cd /
-
- # Return to the original directory so that
- # - the next file is processed in correct conditions
- # - the temporary file can be removed
- cd "$orig_pwd" || exit 1
-}
-
-# func_dirname FILE
-# -----------------
-# Return the directory part of FILE.
-func_dirname ()
-{
- dirname "$1" 2>/dev/null \
- || { echo "$1" | sed 's!/[^/]*$!!;s!^$!.!'; }
-}
-
-
-# noexit FILE
-# -----------
-# Return FILE with one extension remove. foo.bar.baz -> foo.bar.
-noext ()
-{
- echo "$1" | sed -e 's/\.[^/.][^/.]*$//'
-}
-
-
-# absolute NAME -> ABS-NAME
-# -------------------------
-# Return an absolute path to NAME.
-absolute ()
-{
- case $1 in
- [\\/]* | ?:[\\/]*)
- # Absolute paths don't need to be expanded.
- echo "$1"
- ;;
- *) local slashes
- slashes=`echo "$1" | sed -n 's,.*[^/]\(/*\)$,\1,p'`
- local rel
- rel=$orig_pwd/`func_dirname "$1"`
- if test -d "$rel"; then
- (cd "$rel" 2>/dev/null &&
- local n
- n=`pwd`/`basename "$1"`"$slashes"
- echo "$n")
- else
- error 1 "not a directory: $rel"
- fi
- ;;
- esac
-}
-
-
-# ensure_dir DIR1 DIR2...
-# -----------------------
-# Make sure the directories exist.
-ensure_dir ()
-{
- for dir
- do
- # Beware that in parallel builds we may have several concurrent
- # attempts to create the directory. So fail only if "mkdir"
- # failed *and* the directory still does not exist.
- test -d "$dir" \
- || mkdir "$dir" \
- || test -d "$dir" \
- || error 1 "cannot create directory: $dir"
- done
-}
-
-
-# error EXIT_STATUS LINE1 LINE2...
-# --------------------------------
-# Report an error and exit with failure if EXIT_STATUS is non null.
-error ()
-{
- local s="$1"
- shift
- report "$@"
- if test "$s" != 0; then
- exit $s
- fi
-}
-
-
-# findprog PROG
-# -------------
-# Return true if PROG is somewhere in PATH, else false.
-findprog ()
-{
- local saveIFS="$IFS"
- IFS=$path_sep # break path components at the path separator
- for dir in $PATH; do
- IFS=$saveIFS
- # The basic test for an executable is `test -f $f && test -x $f'.
- # (`test -x' is not enough, because it can also be true for directories.)
- # We have to try this both for $1 and $1.exe.
- #
- # Note: On Cygwin and DJGPP, `test -x' also looks for .exe. On Cygwin,
- # also `test -f' has this enhancement, but not on DJGPP. (Both are
- # design decisions, so there is little chance to make them consistent.)
- # Thusly, it seems to be difficult to make use of these enhancements.
- #
- if { test -f "$dir/$1" && test -x "$dir/$1"; } ||
- { test -f "$dir/$1.exe" && test -x "$dir/$1.exe"; }; then
- return 0
- fi
- done
- return 1
-}
-
-# report LINE1 LINE2...
-# ---------------------
-# Report some information on stderr.
-report ()
-{
- for i in "$@"
- do
- echo >&2 "$0: $i"
- done
-}
-
-
-# run COMMAND-LINE
-# ----------------
-# Run the COMMAND-LINE verbosely, and catching errors as failures.
-run ()
-{
- verbose "Running $@"
- "$@" 2>&5 1>&2 ||
- error 1 "$1 failed"
-}
-
-
-# usage
-# -----
-# Display usage and exit successfully.
-usage ()
-{
- # We used to simply have `echo "$usage"', but coping with the
- # changing behavior of `echo' is much harder than simply using a
- # here-doc.
- #
- # echo '\noto' echo '\\noto' echo -e '\\noto'
- # bash 3.1 \noto \\noto \noto
- # bash 3.2 %oto \noto -e \noto
- #
- # where % denotes the eol character.
- cat <<EOF
-Usage: $program [OPTION]... FILE...
- texi2pdf [OPTION]... FILE...
- pdftexi2dvi [OPTION]... FILE...
-
-Run each Texinfo or (La)TeX FILE through TeX in turn until all
-cross-references are resolved, building all indices. The directory
-containing each FILE is searched for included files. The suffix of FILE
-is used to determine its language ((La)TeX or Texinfo). To process
-(e)plain TeX files, set the environment variable LATEX=tex.
-
-In order to make texi2dvi a drop-in replacement of TeX/LaTeX in AUC-TeX,
-the FILE may also be composed of the following simple TeX commands.
- \`\\input{FILE}' the actual file to compile
- \`\\nonstopmode' same as --batch
-
-When invoked as \`texi2pdf' or \`pdftexi2dvi', or given the option --pdf
-or --dvipdf, generate PDF output. Otherwise, generate DVI.
-
-General options:
- -b, --batch no interaction
- -D, --debug turn on shell debugging (set -x)
- -h, --help display this help and exit successfully
- -o, --output=OFILE leave output in OFILE (implies --clean);
- only one input FILE may be specified in this case
- -q, --quiet no output unless errors (implies --batch)
- -s, --silent same as --quiet
- -v, --version display version information and exit successfully
- -V, --verbose report on what is done
-
-TeX tuning:
- -@ use @input instead of \input for preloaded Texinfo
- -e, -E, --expand force macro expansion using makeinfo
- -I DIR search DIR for Texinfo files
- -l, --language=LANG specify LANG for FILE, either latex or texinfo
- --no-line-error do not pass --file-line-error to TeX
- -r, --recode call recode before TeX to translate input
- --recode-from=ENC recode from ENC to the @documentencoding
- --src-specials pass --src-specials to TeX
- -t, --command=CMD insert CMD in copy of input file
- or --texinfo=CMD multiple values accumulate
- --translate-file=FILE use given charset translation file for TeX
-
-Output format:
- --dvi output a DVI file [default]
- --dvipdf output a PDF file via DVI (using dvipdf)
- --html output an HTML file. Use HeVeA for LaTeX files
- --info output an Info file. Use HeVeA for LaTeX files
- -p, --pdf use pdftex or pdflatex for processing
- --ps output a PDF file via DVI (using dvips)
- --text output a plain text file. Use HeVeA for LaTeX files
-
-Build modes:
- --build=MODE specify the treatment of auxiliary files [$build_mode]
- --tidy same as --build=tidy
- -c, --clean same as --build=clean
- --build-dir=DIR specify where the tidy compilation is performed;
- implies --tidy;
- defaults to TEXI2DVI_BUILD_DIRECTORY [$build_dir]
- --mostly-clean remove the auxiliary files and directories
- but not the output
- --max-iterations=N don't process files more than N times
-
-The MODE specifies where the TeX compilation takes place, and, as a
-consequence, how auxiliary files are treated. The build mode
-can also be set using the environment variable TEXI2DVI_BUILD_MODE.
-
-Valid MODEs are:
- \`local' compile in the current directory, leaving all the auxiliary
- files around. This is the traditional TeX use.
- \`tidy' compile in a local *.t2d directory, where the auxiliary files
- are left. Output files are copied back to the original file.
- \`clean' same as \`tidy', but remove the auxiliary directory afterwards.
- Every compilation therefore requires the full cycle.
-
-Using the \`tidy' mode brings several advantages:
- - the current directory is not cluttered with plethora of temporary files.
- - clutter can be even further reduced using --build-dir=dir: all the *.t2d
- directories are stored there.
- - clutter can be reduced to zero using, e.g., --build-dir=/tmp/\$USER.t2d
- or --build-dir=\$HOME/.t2d.
- - the output file is updated after every succesful TeX run, for
- sake of concurrent visualization of the output. In a \`local' build
- the viewer stops during the whole TeX run.
- - if the compilation fails, the previous state of the output file
- is preserved.
- - PDF and DVI compilation are kept in separate subdirectories
- preventing any possibility of auxiliary file incompatibility.
-
-On the other hand, because \`tidy' compilation takes place in another
-directory, occasionally TeX won't be able to find some files (e.g., when
-using \\graphicspath): in that case use -I to specify the additional
-directories to consider.
-
-The values of the BIBTEX, DVIPDF, DVIPS, LATEX, MAKEINDEX, MAKEINFO,
-PDFLATEX, PDFTEX, TEX, TEXINDEX, and THUMBPDF environment variables are used
-to run those commands, if they are set. Any CMD strings are added after
-@setfilename for Texinfo input, in the first line for LaTeX input.
-
-Report bugs to bug-texinfo(a)gnu.org,
-general questions and discussion to help-texinfo(a)gnu.org.
-GNU Texinfo home page: <http://www.gnu.org/software/texinfo/>
-General help using GNU software: <http://www.gnu.org/gethelp/>
-EOF
- exit 0
-}
-
-
-# verbose WORD1 WORD2
-# -------------------
-# Report some verbose information.
-verbose ()
-{
- if $verb; then
- echo >&2 "$0: $@"
- fi
-}
-
-
-# version
-# -------
-# Display version info and exit succesfully.
-version ()
-{
- cat <<EOF
-texi2dvi (GNU Texinfo 4.13) $rcs_version
-
-Copyright (C) 2008 Free Software Foundation, Inc.
-License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
-This is free software: you are free to change and redistribute it.
-There is NO WARRANTY, to the extent permitted by law.
-EOF
- exit 0
-}
-
-
-## ---------------- ##
-## Handling lists. ##
-## ---------------- ##
-
-
-# list_append LIST-NAME ELEM
-# --------------------------
-# Set LIST-NAME to its former contents, with ELEM appended.
-list_append ()
-{
- local la_l="$1"
- shift
- eval set X \$$la_l "$@"
- shift
- eval $la_l=\""$@"\"
-}
-
-
-# list_concat_dirs LIST-NAME DIR-LIST
-# -----------------------------------
-# Append to LIST-NAME all the components (included empty) from
-# the $path_sep separated list DIR-LIST. Make the paths absolute.
-list_concat_dirs ()
-{
- local lcd_list="$1"
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_EMPTY="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- save_IFS=$IFS
- IFS=$path_sep
- set x `echo "$2" | eval sed $replace_EMPTY`; shift
- IFS=$save_IFS
- local dir
- for dir
- do
- case $dir in
- EMPTY)
- list_append $lcd_list ""
- ;;
- *)
- if test -d $dir; then
- dir=`absolute "$dir"`
- list_append $lcd_list "$dir"
- fi
- ;;
- esac
- done
-}
-
-
-# list_prefix LIST-NAME SEP -> STRING
-# -----------------------------------
-# Return a string that is composed of the LIST-NAME with each item
-# preceded by SEP.
-list_prefix ()
-{
- local lp_p="$2"
- eval set X \$$1
- shift
- local lp_res
- for i
- do
- lp_res="$lp_res \"$lp_p\" \"$i\""
- done
- echo "$lp_res"
-}
-
-# list_infix LIST-NAME SEP -> STRING
-# ----------------------------------
-# Same as list_prefix, but a separator.
-list_infix ()
-{
- eval set X \$$1
- shift
- local la_IFS="$IFS"
- IFS=$path_sep
- echo "$*"
- IFS=$la_IFS
-}
-
-# list_dir_to_abs LIST-NAME
-# -------------------------
-# Convert the list to using only absolute dir names.
-# Currently unused, but should replace absolute_filenames some day.
-list_dir_to_abs ()
-{
- local ld_l="$1"
- eval set X \$$ld_l
- shift
- local ld_res
- for dir
- do
- dir=`absolute "$dir"`
- test -d "$dir" || continue
- ld_res="$ld_res \"$dir\""
- done
- set X $ld_res; shift
- eval $ld_l=\"$@\"
-}
-
-
-## ------------------------------ ##
-## Language auxiliary functions. ##
-## ------------------------------ ##
-
-
-# out_lang_set LANG
-# -----------------
-out_lang_set ()
-{
- case $1 in
- dvi|dvipdf|html|info|pdf|ps|text) out_lang=$1;;
- *) error 1 "invalid output format: $1";;
- esac
-}
-
-
-# out_lang_tex
-# ------------
-# Return the tex output language (DVI or PDF) for $OUT_LANG.
-out_lang_tex ()
-{
- case $out_lang in
- dvi | ps | dvipdf ) echo dvi;;
- pdf ) echo $out_lang;;
- html | info | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-# out_lang_ext
-# ------------
-# Return the extension for $OUT_LANG.
-out_lang_ext ()
-{
- case $out_lang in
- dvipdf ) echo pdf;;
- dvi | html | info | pdf | ps | text ) echo $out_lang;;
- *) error 1 "invalid out_lang: $1";;
- esac
-}
-
-
-## ------------------------- ##
-## TeX auxiliary functions. ##
-## ------------------------- ##
-
-# Save TEXINPUTS so we can construct a new TEXINPUTS path for each file.
-# Likewise for bibtex and makeindex.
-tex_envvars="BIBINPUTS BSTINPUTS DVIPSHEADERS INDEXSTYLE MFINPUTS MPINPUTS \
-TEXINPUTS TFMFONTS"
-for var in $tex_envvars; do
- eval ${var}_orig=\$$var
- export $var
-done
-
-
-# absolute_filenames TEX-PATH -> TEX-PATH
-# ---------------------------------------
-# Convert relative paths to absolute paths, so we can run in another
-# directory (e.g., in tidy build mode, or during the macro-support
-# detection). Prepend ".".
-absolute_filenames ()
-{
- # Empty path components are meaningful to tex. We rewrite them as
- # `EMPTY' so they don't get lost when we split on $path_sep.
- # Hopefully no one will have an actual directory named EMPTY.
- local replace_empty="-e 's/^$path_sep/EMPTY$path_sep/g' \
- -e 's/$path_sep\$/${path_sep}EMPTY/g' \
- -e 's/$path_sep$path_sep/${path_sep}EMPTY:/g'"
- local res
- res=`echo "$1" | eval sed $replace_empty`
- save_IFS=$IFS
- IFS=$path_sep
- set x $res; shift
- res=.
- for dir
- do
- case $dir in
- EMPTY)
- res=$res$path_sep
- ;;
- *)
- if test -d "$dir"; then
- res=$res$path_sep`absolute "$dir"`
- else
- # Even if $dir is not a directory, preserve it in the path.
- # It might contain metacharacters that TeX will expand in
- # turn, e.g., /some/path/{a,b,c}. This will not get the
- # implicit absolutification of the path, but we can't help that.
- res=$res$path_sep$dir
- fi
- ;;
- esac
- done
- echo "$res"
-}
-
-
-# output_base_name FILE
-# ---------------------
-# The name of FILE, possibly renamed to satisfy --output.
-# FILE is local, there is no directory part.
-output_base_name ()
-{
- case $oname in
- '') echo "$1";;
- *) local out_noext
- out_noext=`noext "$oname"`
- local file_ext
- file_ext=`echo "$1" | sed 's/^.*\.//'`
- echo "$out_noext.$file_ext"
- ;;
- esac
-}
-
-
-# destdir
-# -------
-# Return the name of the directory where the output is expected.
-destdir ()
-{
- case $oname in
- '') echo "$orig_pwd";;
- *) dirname "$oname";;
- esac
-}
-
-
-# move_to_dest FILE...
-# --------------------
-# Move FILE to the place where the user expects it. Truly move it, that
-# is, it must not remain in its build location unless that is also the
-# output location. (Otherwise it might appear as an extra file in make
-# distcheck.)
-#
-# FILE can be the principal output (in which case -o directly applies), or
-# an auxiliary file with the same base name.
-move_to_dest ()
-{
- # If we built in place, there is nothing to install, leave.
- case $tidy:$oname in
- false:) return;;
- esac
-
- local destfile
- local destdir
- local destbase
- local sourcedir
- local sourcebase
-
- for file
- do
- test -f "$file" ||
- error 1 "no such file or directory: $file"
- case $tidy:$oname in
- true:) destdir=$orig_pwd
- destfile=$destdir/$file;;
- *:*) destfile=`output_base_name "$file"`
- destdir=`dirname "$destfile"`;;
- esac
- # We want to compare the source location and the output location,
- # and if they are different, do the move. But if they are the
- # same, we must preserve the source. Since we can't assume
- # stat(1) or test -ef is available, resort to comparing the
- # directory names, canonicalized with pwd. We can't use cmp -s
- # since the output file might not actually change from run to run;
- # e.g., TeX DVI output is timestamped to only the nearest minute.
- destdir=`cd "$destdir" && pwd`
- destbase=`basename "$destfile"`
-
- sourcedir=`dirname "$file"`
- sourcedir=`cd "$sourcedir" && pwd`
- sourcebase=`basename "$file"`
-
- if test "$sourcedir/$sourcebase" != "$destdir/$destbase"; then
- verbose "Moving $file to $destfile"
- rm -f "$destfile"
- mv "$file" "$destfile"
- fi
- done
-}
-
-
-## --------------------- ##
-## Managing xref files. ##
-## --------------------- ##
-
-# aux_file_p FILE
-# ---------------
-# Return with success if FILE is an aux file.
-aux_file_p ()
-{
- test -f "$1" || return 1
- case $1 in
- *.aux) return 0;;
- *) return 1;;
- esac
-}
-
-# bibaux_file_p FILE
-# ------------------
-# Return with success if FILE is an aux file containing citation
-# requests.
-bibaux_file_p ()
-{
- test -s "$1" || return 1
- if (grep '^\\bibstyle[{]' "$1" \
- && grep '^\\bibdata[{]' "$1" \
- ## The following line is suspicious: fails when there
- ## are citations in sub aux files. We need to be
- ## smarter in this case.
- ## && grep '^\\citation[{]' "$f"
- ) >&6 2>&1;
- then
- return 0
- fi
- return 1
-}
-
-# index_file_p FILE
-# -----------------
-# Return with success if FILE is an index file.
-index_file_p ()
-{
- test -f "$1" || return 1
- case $in_lang:$latex2html:`out_lang_tex`:`sed '1q' "$1"` in
- # When working with TeX4HT, *.idx are created by LaTeX. They must
- # be processed to produce *.4ix, *.4dx files. The *.4dx file is
- # passed to makeindex to produce the *.ind file. This sequence is
- # handled by run_index, so we are only interested in the *.idx
- # files, which have each "\indexentry" preceded by a
- # "\beforeentry".
- latex:tex4ht:html:"\\beforeentry {"*) return 0;;
-
- # When index.sty is used, there is a space before the brace.
- latex:*:*:"\\indexentry{"*|latex:*:*:"\\indexentry {"*) return 0;;
-
- texinfo:*:*:"\\entry{"*) return 0;;
-
- *) return 1;;
- esac
-}
-
-# xref_file_p FILE
-# ----------------
-# Return with success if FILE is an xref file (indexes, tables and lists).
-xref_file_p ()
-{
- test -f "$1" || return 1
- # If the file is not suitable to be an index or xref file, don't
- # process it. It's suitable if the first character is a
- # backslash or right quote or at, as long as the first line isn't
- # \input texinfo.
- case `sed '1q' "$1"` in
- "\\input texinfo"*) return 1;;
- [\\''@]*) return 0;;
- *) return 1;;
- esac
-}
-
-
-# generated_files_get FILENAME-NOEXT [PREDICATE-FILTER]
-# -----------------------------------------------------
-# Return the list of files generated by the TeX compilation of FILENAME-NOEXT.
-generated_files_get ()
-{
- local filter=true
- if test -n "$2"; then
- filter=$2
- fi
-
- # Gather the files created by TeX.
- (
- if test -f "$1.log"; then
- sed -n -e "s,^\\\\openout.* = \`\\(.*\\)'\\.,\\1,p" "$1.log"
- fi
- echo "$1.log"
- ) |
- # Depending on these files, infer outputs from other tools.
- while read file; do
- echo $file
- case $in_lang in
- texinfo)
- # texindex: texinfo.cp -> texinfo.cps
- if index_file_p $file; then
- echo ${file}s
- fi
- ;;
- latex)
- if aux_file_p $file; then
- # bibtex: *.aux -> *.bbl and *.blg.
- echo $file | sed 's/^\(.*\)\.aux$/\1.bbl/'
- echo $file | sed 's/^\(.*\)\.aux$/\1.blg/'
- # -recorder: .fls
- echo $file | sed 's/^\(.*\)\.aux$/\1.fls/'
- fi
- ;;
- esac
- done |
- # Filter existing files matching the criterion.
- #
- # With an input file name containing a space, this produces a
- # "command not found" message (and filtering is ineffective).
- # The situation with a newline is presumably even worse.
- while read file; do
- if $filter "$file"; then
- echo $file
- fi
- done |
- sort |
- # Some files are opened several times, e.g., listings.sty's *.vrb.
- uniq
-}
-
-
-# xref_files_save
-# ---------------
-# Save the xref files.
-xref_files_save ()
-{
- # Save copies of auxiliary files for later comparison.
- xref_files_orig=`generated_files_get "$in_noext" xref_file_p`
- if test -n "$xref_files_orig"; then
- verbose "Backing up xref files: $xref_files_orig"
- # The following line improves `cp $xref_files_orig "$work_bak"'
- # by preserving the directory parts. Think of
- # cp chap1/main.aux chap2/main.aux $work_bak.
- #
- # Users may have, e.g., --keep-old-files. Don't let this interfere.
- # (Don't use unset for the sake of ancient shells.)
- TAR_OPTIONS=; export TAR_OPTIONS
- tar cf - $xref_files_orig | (cd "$work_bak" && tar xf -)
- fi
-}
-
-
-# xref_files_changed
-# ------------------
-# Whether the xref files were changed since the previous run.
-xref_files_changed ()
-{
- # LaTeX (and the package changebar) report in the LOG file if it
- # should be rerun. This is needed for files included from
- # subdirs, since texi2dvi does not try to compare xref files in
- # subdirs. Performing xref files test is still good since LaTeX
- # does not report changes in xref files.
- if grep "Rerun to get" "$in_noext.log" >&6 2>&1; then
- return 0
- fi
-
- # If old and new lists don't at least have the same file list,
- # then one file or another has definitely changed.
- xref_files_new=`generated_files_get "$in_noext" xref_file_p`
- verbose "Original xref files = $xref_files_orig"
- verbose "New xref files = $xref_files_new"
- if test "x$xref_files_orig" != "x$xref_files_new"; then
- return 0
- fi
-
- # Compare each file until we find a difference.
- for this_file in $xref_files_new; do
- verbose "Comparing xref file `echo $this_file | sed 's|\./||g'` ..."
- # cmp -s returns nonzero exit status if files differ.
- if cmp -s "$this_file" "$work_bak/$this_file"; then :; else
- verbose "xref file `echo $this_file | sed 's|\./||g'` differed ..."
- if $debug; then
- diff -u "$work_bak/$this_file" "$this_file"
- fi
- return 0
- fi
- done
-
- # No change.
- return 1
-}
-
-
-
-## ----------------------- ##
-## Running the TeX suite. ##
-## ----------------------- ##
-
-
-
-# run_tex ()
-# ----------
-# Run TeX as "$tex $in_input", taking care of errors and logs.
-run_tex ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:*:dvi|latex:tex4ht:html)
- tex=${LATEX:-latex};;
- latex:*:pdf)
- tex=${PDFLATEX:-pdflatex};;
- texinfo:*:dvi)
- # MetaPost also uses the TEX environment variable. If the user
- # has set TEX=latex for that reason, don't bomb out.
- case $TEX in
- *latex) tex=tex;; # don't bother trying to find etex
- *) tex=$TEX
- esac;;
- texinfo:*:pdf) tex=$PDFTEX;;
-
- *) error 1 "$out_lang not supported for $in_lang";;
- esac
-
- # do the special catcode trick for ~ in filenames only for Texinfo,
- # not LaTeX.
- if test x"$in_lang" = xtexinfo && test $catcode_special = maybe; then
- catcode_special=true
- else
- catcode_special=false
- fi
-
- # Beware of aux files in subdirectories that require the
- # subdirectory to exist.
- case $in_lang:$tidy in
- latex:true)
- sed -n 's|^[ ]*\\include{\(.*\)/.*}.*|\1|p' "$in_input" |
- sort -u |
- while read d
- do
- ensure_dir "$work_build/$d"
- done
- ;;
- esac
-
- # Note that this will be used via an eval: quote properly.
- local cmd="$tex"
-
- # If possible, make TeX report error locations in GNU format.
- if $line_error; then
- if test "${tex_help:+set}" != set; then
- # Go to a temporary directory to try --help, since old versions that
- # don't accept --help will generate a texput.log.
- tex_help_dir=$t2ddir/tex_help
- ensure_dir "$tex_help_dir"
- tex_help=`cd "$tex_help_dir" >&6 && $tex --help </dev/null 2>&1 || true`
- fi
- # The mk program and perhaps others want to parse TeX's
- # original error messages.
- case $tex_help in
- *file-line-error*) cmd="$cmd --file-line-error";;
- esac
- fi
-
- # Tell TeX about TCX file, if specified.
- test -n "$translate_file" && cmd="$cmd --translate-file=$translate_file"
-
- # Tell TeX to make source specials (for backtracking from output to
- # source, given a sufficiently smart editor), if specified.
- test -n "$src_specials" && cmd="$cmd $src_specials"
-
- # Tell TeX to be batch if requested.
- if $batch; then
- # \batchmode does not show terminal output at all, so we don't
- # want that. And even in batch mode, TeX insists on having input
- # from the user. Close its stdin to make it impossible.
- cmd="$cmd </dev/null '${escape}nonstopmode'"
- fi
-
- # we'd like to handle arbitrary input file names, especially
- # foo~bar/a~b.tex, since Debian likes ~ characters.
- if $catcode_special; then
- # $normaltilde is just to reduce line length in this source file.
- # The idea is to define \normaltilde as a catcode other ~ character,
- # then make the active ~ be equivalent to that, instead of the plain
- # TeX tie. Then when the active ~ appears in the filename, it will
- # be expanded to itself, as far as \input will see. (This is the
- # same thing that texinfo.tex does in general, BTW.)
- normaltilde="${escape}catcode126=12 ${escape}def${escape}normaltilde{~}"
- cmd="$cmd '$normaltilde${escape}catcode126=13 ${escape}let~\normaltilde '"
- fi
- # Other special (non-active) characters could be supported by
- # resetting their catcodes to other on the command line and changing
- # texinfo.tex to initialize everything to plain catcodes. Maybe someday.
-
- # append the \input command.
- cmd="$cmd '${escape}input'"
-
- # TeX's \input does not (easily or reliably) support whitespace
- # characters or other special characters in file names. Our intensive
- # use of absolute file names makes this worse: the enclosing directory
- # names may include white spaces. Improve the situation using a
- # symbolic link to the filename in the current directory, in tidy mode
- # only. Do not alter in_input.
- #
- # The filename is almost always tokenized using plain TeX conventions
- # (the exception would be if the user made a texinfo.fmt file). Not
- # all the plain TeX special characters cause trouble, but there's no
- # harm in making the link.
- #
- case $tidy:`func_dirname "$in_input"` in
- true:*["$space$tab$newline\"#\$%\\^_{}~"]*)
- _run_tex_file_name=`basename "$in_input"`
- if test ! -f "$_run_tex_file_name"; then
- # It might not be a file, clear it.
- run rm -f "$_run_tex_file_name"
- run ln -s "$in_input"
- fi
- cmd="$cmd '$_run_tex_file_name'"
- ;;
-
- *)
- cmd="$cmd '$in_input'"
- ;;
- esac
-
- verbose "$0: Running $cmd ..."
- if eval "$cmd" >&5; then
- case $out_lang in
- dvi | pdf ) move_to_dest "$in_noext.$out_lang";;
- esac
- else
- error 1 "$tex exited with bad status, quitting."
- fi
-}
-
-# run_bibtex ()
-# -------------
-# Run bibtex on current file.
-# - If its input (AUX) exists.
-# - If some citations are missing (LOG contains `Citation').
-# or the LOG complains of a missing .bbl
-#
-# Don't try to be too smart:
-#
-# 1. Running bibtex only if the bbl file exists and is older than
-# the LaTeX file is wrong, since the document might include files
-# that have changed.
-#
-# 3. Because there can be several AUX (if there are \include's),
-# but a single LOG, looking for missing citations in LOG is
-# easier, though we take the risk to match false messages.
-run_bibtex ()
-{
- case $in_lang in
- latex) bibtex=${BIBTEX:-bibtex};;
- texinfo) return;;
- esac
-
- # "Citation undefined" is for LaTeX, "Undefined citation" for btxmac.tex.
- # The no .aux && \bibdata test is also for btxmac, in case it was the
- # first run of a bibtex-using document. Otherwise, it's possible that
- # bibtex would never be run.
- if test -r "$in_noext.aux" \
- && test -r "$in_noext.log" \
- && ((grep 'Warning:.*Citation.*undefined' "$in_noext.log" \
- || grep '.*Undefined citation' "$in_noext.log" \
- || grep 'No file .*\.bbl\.' "$in_noext.log") \
- || (grep 'No \.aux file' "$in_noext.log" \
- && grep '^\\bibdata' "$in_noext.aux")) \
- >&6 2>&1; \
- then
- for f in `generated_files_get "$in_noext" bibaux_file_p`
- do
- run $bibtex "$f"
- done
- fi
-}
-
-# run_index ()
-# ------------
-# Run texindex (or makeindex or texindy) on current index files. If
-# they already exist, and after running TeX a first time the index
-# files don't change, then there's no reason to run TeX again. But we
-# won't know that if the index files are out of date or nonexistent.
-run_index ()
-{
- local index_files=`generated_files_get $in_noext index_file_p`
- test -n "$index_files" ||
- return 0
-
- : ${MAKEINDEX:=makeindex}
- : ${TEXINDEX:=texindex}
- : ${TEXINDY:=texindy}
-
- local index_file
- local index_noext
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- for index_file in $index_files
- do
- index_noext=`noext "$index_file"`
- run tex \
- '\def\filename{{'"$index_noext"'}{idx}{4dx}{ind}}
- \input idxmake.4ht'
- run $MAKEINDEX -o $index_noext.ind $index_noext.4dx
- done
- ;;
-
- latex:*)
- if $TEXINDY --version >&6 2>&1; then
- run $TEXINDY $index_files
- else
- run $MAKEINDEX $index_files
- fi
- ;;
-
- texinfo:*)
- run $TEXINDEX $index_files
- ;;
- esac
-}
-
-
-# run_tex4ht ()
-# -------------
-# Run the last two phases of TeX4HT: tex4ht extracts the HTML from the
-# instrumented DVI file, and t4ht converts the figures and installs
-# the files when given -d.
-#
-# Because knowing exactly which files are created is complex (in
-# addition the names are not simple to compute), which makes it
-# difficult to install the output files in a second step, it is much
-# simpler to install directly the output files.
-run_tex4ht ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- : ${TEX4HT=tex4ht} ${T4HT=t4ht}
- run "$TEX4HT" "-f/$in_noext"
- # Do not remove the / after the destdir.
- run "$T4HT" "-d`destdir`/" "-f/$in_noext"
- ;;
- esac
-}
-
-
-# run_thumbpdf ()
-# ---------------
-run_thumbpdf ()
-{
- if test `out_lang_tex` = pdf \
- && test -r "$in_noext.log" \
- && grep 'thumbpdf\.sty' "$in_noext.log" >&6 2>&1; \
- then
- thumbpdf=${THUMBPDF:-thumbpdf}
- thumbcmd="$thumbpdf $in_dir/$in_noext"
- verbose "Running $thumbcmd ..."
- if $thumbcmd >&5; then
- run_tex
- else
- report "$thumbpdf exited with bad status." \
- "Ignoring its output."
- fi
- fi
-}
-
-
-# run_dvipdf FILE.dvi
-# -------------------
-# Convert FILE.dvi to FILE.pdf.
-run_dvipdf ()
-{
- # Find which dvi->pdf program is available.
- if test -z "$dvipdf"; then
- for i in "$DVIPDF" dvipdfmx dvipdfm dvipdf dvi2pdf dvitopdf;
- do
- if findprog $i; then
- dvipdf=$i
- fi
- done
- fi
- # These tools have varying interfaces, some 'input output', others
- # 'input -o output'. They all seem to accept 'input' only,
- # outputting using the expected file name.
- run $dvipdf "$1"
- if test ! -f `echo "$1" | sed -e 's/\.dvi$/.pdf/'`; then
- error 1 "cannot find output file"
- fi
-}
-
-# run_tex_suite ()
-# ----------------
-# Run the TeX tools until a fix point is reached.
-run_tex_suite ()
-{
- # Move to the working directory.
- if $tidy; then
- verbose "cd $work_build"
- cd "$work_build" || exit 1
- fi
-
- # Count the number of cycles.
- local cycle=0
-
- while :; do
- # check for probably LaTeX loop (e.g. varioref)
- if test $cycle -eq "$max_iters"; then
- error 0 "Maximum of $max_iters cycles exceeded"
- break
- fi
-
- # report progress
- cycle=`expr $cycle + 1`
- verbose "Cycle $cycle for $command_line_filename"
-
- xref_files_save
-
- # We run bibtex first, because I can see reasons for the indexes
- # to change after bibtex is run, but I see no reason for the
- # converse.
- run_bibtex
- run_index
- run_core_conversion
-
- xref_files_changed || break
- done
-
- # If we were using thumbpdf and producing PDF, then run thumbpdf
- # and TeX one last time.
- run_thumbpdf
-
- # If we are using tex4ht, call it.
- run_tex4ht
-
- # Install the result if we didn't already (i.e., if the output is
- # dvipdf or ps).
- case $latex2html:$out_lang in
- *:dvipdf)
- run_dvipdf "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- *:ps)
- : {DVIPS=dvips}
- $DVIPS -o "$in_noext.`out_lang_ext`" "$in_noext.`out_lang_tex`"
- move_to_dest "$in_noext.`out_lang_ext`"
- ;;
- esac
-
- cd_orig
-}
-
-## -------------------------------- ##
-## TeX processing auxiliary tools. ##
-## -------------------------------- ##
-
-
-# A sed script that preprocesses Texinfo sources in order to keep the
-# iftex sections only. We want to remove non TeX sections, and comment
-# (with `@c _texi2dvi') TeX sections so that makeinfo does not try to
-# parse them. Nevertheless, while commenting TeX sections, don't
-# comment @macro/@end macro so that makeinfo does propagate them.
-# Unfortunately makeinfo --iftex --no-ifinfo doesn't work well enough
-# (yet), makeinfo can't parse the TeX commands, so work around with sed.
-#
-# We assume that `@c _texi2dvi' starting a line is not present in the
-# document.
-#
-comment_iftex=\
-'/^@tex/,/^@end tex/{
- s/^/@c _texi2dvi/
-}
-/^@iftex/,/^@end iftex/{
- s/^/@c _texi2dvi/
- /^@c _texi2dvi@macro/,/^@c _texi2dvi@end macro/{
- s/^@c _texi2dvi//
- }
-}
-/^@ifnottex/,/^@end ifnottex/{
- s/^/@c (_texi2dvi)/
-}
-/^@ifinfo/,/^@end ifinfo/{
- /^@node/p
- /^@menu/,/^@end menu/p
- t
- s/^/@c (_texi2dvi)/
-}
-s/^@ifnotinfo/@c _texi2dvi@ifnotinfo/
-s/^@end ifnotinfo/@c _texi2dvi@end ifnotinfo/'
-
-# Uncommenting is simpler: remove any leading `@c texi2dvi'; repeated
-# copies can sneak in via macro invocations.
-uncomment_iftex='s/^@c _texi2dvi\(@c _texi2dvi\)*//'
-
-
-# run_makeinfo ()
-# ---------------
-# Expand macro commands in the original source file using Makeinfo.
-# Always use `end' footnote style, since the `separate' style
-# generates different output (arguably this is a bug in -E). Discard
-# main info output, the user asked to run TeX, not makeinfo.
-run_makeinfo ()
-{
- test $in_lang = texinfo \
- || return 0
-
- # Unless required by the user, makeinfo expansion is wanted only
- # if texinfo.tex is too old.
- if $expand; then
- makeinfo=${MAKEINFO:-makeinfo}
- else
- # Check if texinfo.tex performs macro expansion by looking for
- # its version. The version is a date of the form YEAR-MO-DA.
- # We don't need to use [0-9] to match the digits since anyway
- # the comparison with $txiprereq, a number, will fail with non
- # digits.
- # Run in a temporary directory to avoid leaving files.
- version_test_dir=$t2ddir/version_test
- ensure_dir "$version_test_dir"
- (
- cd "$version_test_dir"
- echo '\input texinfo.tex @bye' >txiversion.tex
- # Be sure that if tex wants to fail, it is not interactive:
- # close stdin.
- $TEX txiversion.tex </dev/null >txiversion.out 2>txiversion.err
- )
- if test $? != 0; then
- cat "$version_test_dir/txiversion.out"
- cat "$version_test_dir/txiversion.err" >&2
- error 1 "texinfo.tex appears to be broken, quitting."
- fi
- eval `sed -n 's/^.*\[\(.*\)version \(....\)-\(..\)-\(..\).*$/txiformat=\1 txiversion="\2\3\4"/p' "$version_test_dir/txiversion.out"`
- verbose "texinfo.tex preloaded as \`$txiformat', version is \`$txiversion' ..."
- if test "$txiprereq" -le "$txiversion" >&6 2>&1; then
- makeinfo=
- else
- makeinfo=${MAKEINFO:-makeinfo}
- fi
- # If TeX is preloaded, offer the user this convenience:
- if test "$txiformat" = Texinfo; then
- escape=@
- fi
- fi
-
- if test -n "$makeinfo"; then
- # in_src: the file with macros expanded.
- # Use the same basename to generate the same aux file names.
- work_src=$workdir/src
- ensure_dir "$work_src"
- in_src=$work_src/$in_base
- local miincludes
- miincludes=`list_prefix includes -I`
- verbose "Macro-expanding $command_line_filename to $in_src ..."
- # eval $makeinfo because it might be defined as something complex
- # (running missing) and then we end up with things like '"-I"',
- # and "-I" (including the quotes) is not an option name. This
- # happens with gettext 0.14.5, at least.
- sed "$comment_iftex" "$command_line_filename" \
- | eval $makeinfo --footnote-style=end -I "$in_dir" $miincludes \
- -o /dev/null --macro-expand=- \
- | sed "$uncomment_iftex" >"$in_src"
- # Continue only if everything succeeded.
- if test $? -ne 0 \
- || test ! -r "$in_src"; then
- verbose "Expansion failed, ignored...";
- else
- in_input=$in_src
- fi
- fi
-}
-
-# insert_commands ()
-# ------------------
-# Used most commonly for @finalout, @smallbook, etc.
-insert_commands ()
-{
- if test -n "$textra"; then
- # _xtr. The file with the user's extra commands.
- work_xtr=$workdir/xtr
- in_xtr=$work_xtr/$in_base
- ensure_dir "$work_xtr"
- verbose "Inserting extra commands: $textra"
- local textra_cmd
- case $in_lang in
- latex) textra_cmd=1i;;
- texinfo) textra_cmd='/^@setfilename/a';;
- *) error 1 "internal error, unknown language: $in_lang";;
- esac
- sed "$textra_cmd\\
-$textra" "$in_input" >"$in_xtr"
- in_input=$in_xtr
- fi
-
- case $in_lang:$latex2html:`out_lang_tex` in
- latex:tex4ht:html)
- # _tex4ht. The file with the added \usepackage{tex4ht}.
- work_tex4ht=$workdir/tex4ht
- in_tex4ht=$work_tex4ht/$in_base
- ensure_dir "$work_tex4ht"
- verbose "Inserting \\usepackage{tex4ht}"
- perl -pe 's<\\documentclass(?:\[.*\])?{.*}>
- <$&\\usepackage[xhtml]{tex4ht}>' \
- "$in_input" >"$in_tex4ht"
- in_input=$in_tex4ht
- ;;
- esac
-}
-
-# run_recode ()
-# -------------
-# If this is a Texinfo file with a specified input encoding, and
-# recode is available, then recode to plain 7 bit Texinfo.
-run_recode ()
-{
- local from
- local to
-
- if test $in_lang = texinfo; then
- pgm='s/^ *@documentencoding *\([^ ][^ ]*\) *$/\1/
- t found
- d
- :found
- q'
- encoding=`sed -e "$pgm" "$in_input"`
- if $recode && test -n "$encoding" && findprog recode; then
- if test -n "$recode_from"; then
- from=$recode_from
- to=$encoding
- else
- from=$encoding
- to=$texinfo
- fi
- verbose "Recoding from $from to $to."
- # _rcd. The Texinfo file recoded in 7bit.
- work_rcd=$workdir/recode
- in_rcd=$work_rcd/$in_base
- ensure_dir "$work_rcd"
- if recode "$encoding..$to" <"$in_input" >"$in_rcd" \
- && test -s "$in_rcd"; then
- in_input=$in_rcd
- else
- verbose "Recoding failed, using original input."
- fi
- fi
- fi
-}
-
-# compute_language FILENAME
-# -------------------------
-# Return the short string describing the language in which FILENAME
-# is written: `texinfo' or `latex'.
-compute_language ()
-{
- # If the user explicitly specified the language, use that.
- # Otherwise, if the first line is \input texinfo, assume it's texinfo.
- # Otherwise, guess from the file extension.
- if test -n "$set_language"; then
- echo $set_language
- elif sed 1q "$1" | grep 'input texinfo' >&6; then
- echo texinfo
- else
- # Get the type of the file (latex or texinfo) from the given language
- # we just guessed, or from the file extension if not set yet.
- case $1 in
- *.ltx | *.tex | *.drv | *.dtx) echo latex;;
- *) echo texinfo;;
- esac
- fi
-}
-
-
-# run_hevea (MODE)
-# ----------------
-# Convert to HTML/INFO/TEXT.
-#
-# Don't pass `-noiso' to hevea: it's useless in HTML since anyway the
-# charset is set to latin1, and troublesome in other modes since
-# accented characters loose their accents.
-#
-# Don't pass `-o DEST' to hevea because in that case it leaves all its
-# auxiliary files there too... Too bad, because it means we will need
-# to handle images some day.
-run_hevea ()
-{
- local hevea="${HEVEA:-hevea}"
- local run_hevea="$hevea"
-
- case $1 in
- html) ;;
- text|info) run_hevea="$run_hevea -$1";;
- *) error 1 "run_hevea: invalid argument: $1";;
- esac
-
- # Compiling to the tmp directory enables to preserve a previous
- # successful compilation.
- run_hevea="$run_hevea -fix -O -o '$out_base'"
- run_hevea="$run_hevea `list_prefix includes -I` -I '$orig_pwd' "
- run_hevea="$run_hevea '$in_input'"
-
- if $debug; then
- run_hevea="$run_hevea -v -v"
- fi
-
- verbose "running $run_hevea"
- if eval "$run_hevea" >&5; then
- # hevea leaves trailing white spaces, this is annoying.
- case $1 in text|info)
- perl -pi -e 's/[ \t]+$//g' "$out_base"*;;
- esac
- case $1 in
- html|text) move_to_dest "$out_base";;
- info) # There can be foo.info-1, foo.info-2 etc.
- move_to_dest "$out_base"*;;
- esac
- else
- error 1 "$hevea exited with bad status, quitting."
- fi
-}
-
-
-# run_core_conversion ()
-# ----------------------
-# Run the TeX (or HeVeA).
-run_core_conversion ()
-{
- case $in_lang:$latex2html:`out_lang_tex` in
- *:dvi|*:pdf|latex:tex4ht:html)
- run_tex;;
- latex:*:html|latex:*:text|latex:*:info)
- run_hevea $out_lang;;
- *)
- error 1 "invalid input/output combination: $in_lang/$out_lang";;
- esac
-}
-
-
-# compile ()
-# ----------
-# Run the full compilation chain, from pre-processing to installation
-# of the output at its expected location.
-compile ()
-{
- # Source file might include additional sources.
- # We want `.:$orig_pwd' before anything else. (We'll add `.:' later
- # after all other directories have been turned into absolute paths.)
- # `.' goes first to ensure that any old .aux, .cps,
- # etc. files in ${directory} don't get used in preference to fresher
- # files in `.'. Include orig_pwd in case we are in clean build mode, where
- # we have cd'd to a temp directory.
- common="$orig_pwd$path_sep$in_dir$path_sep"
- #
- # If we have any includes, put those at the end.
- # Keep a final path_sep to get the default (system) TeX directories included.
- txincludes=`list_infix includes $path_sep`
- test -n "$txincludes" && common="$common$txincludes$path_sep"
- #
- for var in $tex_envvars; do
- eval val="\$common\$${var}_orig"
- # Convert relative paths to absolute paths, so we can run in another
- # directory (e.g., in clean build mode, or during the macro-support
- # detection). ".:" is added here.
- val=`absolute_filenames "$val"`
- eval $var="\"$val\""
- export $var
- eval verbose \"$var=\'\$${var}\'\"
- done
-
- # --expand
- run_makeinfo
-
- # --command, --texinfo
- insert_commands
-
- # --recode
- run_recode
-
- # Run until a fix point is reached.
- run_tex_suite
-}
-
-
-# remove FILES
-# ------------
-remove ()
-{
- verbose "Removing" "$@"
- rm -rf "$@"
-}
-
-
-# mostly_clean
-# ------------
-# Remove auxiliary files and directories. Changes the current directory.
-mostly_clean ()
-{
- cd_orig
- set X "$t2ddir"
- shift
- $tidy || {
- local log="$work_build/$in_noext.log"
- set X ${1+"$@"} "$log" `generated_files_get "$work_build/$in_noext"`
- shift
- }
- remove ${1+"$@"}
-}
-
-
-# cleanup ()
-# ----------
-# Remove what should be removed according to options.
-# Called at the end of each compilation cycle, and at the end of
-# the script. Changes the current directory.
-cleanup ()
-{
- case $build_mode in
- local) cd_orig; remove "$t2ddir";;
- clean) mostly_clean;;
- tidy) ;;
- esac
-}
-
-
-
-## ---------------------- ##
-## Command line parsing. ##
-## ---------------------- ##
-
-# Push a token among the arguments that will be used to notice when we
-# ended options/arguments parsing.
-# Use "set dummy ...; shift" rather than 'set - ..." because on
-# Solaris set - turns off set -x (but keeps set -e).
-# Use ${1+"$@"} rather than "$@" because Digital Unix and Ultrix 4.3
-# still expand "$@" to a single argument (the empty string) rather
-# than nothing at all.
-arg_sep="$$--$$"
-set dummy ${1+"$@"} "$arg_sep"; shift
-
-#
-# Parse command line arguments.
-while test x"$1" != x"$arg_sep"; do
-
- # Handle --option=value by splitting apart and putting back on argv.
- case "$1" in
- --*=*)
- opt=`echo "$1" | sed -e 's/=.*//'`
- val=`echo "$1" | sed -e 's/[^=]*=//'`
- shift
- set dummy "$opt" "$val" ${1+"$@"}; shift
- ;;
- esac
-
- # This recognizes --quark as --quiet. Oh well.
- case "$1" in
- -@ ) escape=@;;
- -~ ) catcode_special=false;;
- # Silently and without documentation accept -b and --b[atch] as synonyms.
- -b | --batch) batch=true;;
- --build) shift; build_mode=$1;;
- --build-dir) shift; build_dir=$1; build_mode=tidy;;
- -c | --clean) build_mode=clean;;
- -D | --debug) debug=true;;
- -e | -E | --expand) expand=true;;
- -h | --help) usage;;
- -I) shift; list_concat_dirs includes "$1";;
- -l | --lang | --language) shift; set_language=$1;;
- --mostly-clean) action=mostly-clean;;
- --no-line-error) line_error=false;;
- --max-iterations) shift; max_iters=$1;;
- -o | --out | --output)
- shift
- # Make it absolute, just in case we also have --clean, or whatever.
- oname=`absolute "$1"`;;
-
- # Output formats.
- -O|--output-format) shift; out_lang_set "$1";;
- --dvi|--dvipdf|--html|--info|--pdf|--ps|--text)
- out_lang_set `echo "x$1" | sed 's/^x--//'`;;
-
- -p) out_lang_set pdf;;
- -q | -s | --quiet | --silent) quiet=true; batch=true;;
- -r | --recode) recode=true;;
- --recode-from) shift; recode=true; recode_from="$1";;
- --src-specials) src_specials=--src-specials;;
- --tex4ht) latex2html=tex4ht;;
- -t | --texinfo | --command ) shift; textra="$textra\\
-"`echo "$1" | sed 's/\\\\/\\\\\\\\/g'`;;
- --translate-file ) shift; translate_file="$1";;
- --tidy) build_mode=tidy;;
- -v | --vers*) version;;
- -V | --verb*) verb=true;;
- --) # What remains are not options.
- shift
- while test x"$1" != x"$arg_sep"; do
- set dummy ${1+"$@"} "$1"; shift
- shift
- done
- break;;
- -*)
- error 1 "Unknown or ambiguous option \`$1'." \
- "Try \`--help' for more information."
- ;;
- *) set dummy ${1+"$@"} "$1"; shift;;
- esac
- shift
-done
-# Pop the token
-shift
-
-# $tidy: compile in a t2d directory.
-# $clean: remove all the aux files.
-case $build_mode in
- local) clean=false; tidy=false;;
- tidy) clean=false; tidy=true;;
- clean) clean=true; tidy=true;;
- *) error 1 "invalid build mode: $build_mode";;
-esac
-
-# Interpret remaining command line args as filenames.
-case $# in
- 0)
- error 2 "Missing file arguments." "Try \`--help' for more information."
- ;;
- 1) ;;
- *)
- if test -n "$oname"; then
- error 2 "Can't use option \`--output' with more than one argument."
- fi
- ;;
-esac
-
-
-# We can't do much without tex.
-#
-if findprog ${TEX:-tex}; then :; else cat <<EOM
-You don't have a working TeX binary (${TEX:-tex}) installed anywhere in
-your PATH, and texi2dvi cannot proceed without one. If you want to use
-this script, you'll need to install TeX (if you don't have it) or change
-your PATH or TEX environment variable (if you do). See the --help
-output for more details.
-
-For information about obtaining TeX, please see http://www.tug.org. If
-you happen to be using Debian, you can get it with this command:
- apt-get install tetex-bin
-EOM
- exit 1
-fi
-
-
-# We want to use etex (or pdftex) if they are available, and the user
-# didn't explicitly specify. We don't check for elatex and pdfelatex
-# because (as of 2003), the LaTeX team has asked that new distributions
-# use etex by default anyway.
-#
-# End up with the TEX and PDFTEX variables set to what we are going to use.
-if test -z "$TEX"; then
- if findprog etex; then TEX=etex; else TEX=tex; fi
-fi
-#
-if test -z "$PDFTEX"; then
- if findprog pdfetex; then PDFTEX=pdfetex; else PDFTEX=pdftex; fi
-fi
-
-
-# File descriptor usage:
-# 0 standard input
-# 1 standard output (--verbose messages)
-# 2 standard error
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 5 tools output (turned off by --quiet)
-# 6 tracing/debugging (set -x output, etc.)
-
-
-# Main tools' output (TeX, etc.) that TeX users are used to seeing.
-#
-# If quiet, discard, else redirect to the message flow.
-if $quiet; then
- exec 5>/dev/null
-else
- exec 5>&1
-fi
-
-
-# Enable tracing, and auxiliary tools output.
-#
-# Should be used where you'd typically use /dev/null to throw output
-# away. But sometimes it is convenient to see that output (e.g., from
-# a grep) to aid debugging. Especially debugging at distance, via the
-# user.
-if $debug; then
- exec 6>&1
- set -x
-else
- exec 6>/dev/null
-fi
-
-#
-
-# input_file_name_decode
-# ----------------------
-# Decode COMMAND_LINE_FILENAME, and compute:
-# - COMMAND_LINE_FILENAME clean of TeX commands
-# - IN_DIR
-# The directory to the input file, possibly absolute if needed.
-# - IN_DIR_ABS
-# The absolute directory of the input file.
-# - IN_BASE
-# The input file base name (no directory part).
-# - IN_NOEXT
-# The input file name without extensions (nor directory part).
-# - IN_INPUT
-# Defaults to COMMAND_LINE_FILENAME, but might change if the
-# input is preprocessed (recode etc.). With directory, possibly absolute.
-input_file_name_decode ()
-{
- # See if we are run from within AUC-Tex, in which case we are
- # passed `\input{FOO.tex}' or even `\nonstopmode\input{FOO.tex}'.
- case $command_line_filename in
- *\\nonstopmode*)
- batch=true;;
- esac
- case $command_line_filename in
- *\\input{*}*)
- # Let AUC-TeX error parser deal with line numbers.
- line_error=false
- command_line_filename=`\
- expr X"$command_line_filename" : X'.*input{\([^}]*\)}'`
- ;;
- esac
-
- # If the COMMAND_LINE_FILENAME is not absolute (e.g., --debug.tex),
- # prepend `./' in order to avoid that the tools take it as an option.
- echo "$command_line_filename" | $EGREP '^(/|[A-z]:/)' >&6 \
- || command_line_filename="./$command_line_filename"
-
- # See if the file exists. If it doesn't we're in trouble since, even
- # though the user may be able to reenter a valid filename at the tex
- # prompt (assuming they're attending the terminal), this script won't
- # be able to find the right xref files and so forth.
- test -r "$command_line_filename" ||
- error 1 "cannot read $command_line_filename, skipping."
-
- # Get the name of the current directory.
- in_dir=`func_dirname "$command_line_filename"`
- in_dir_abs=`absolute "$in_dir"`
- # In a clean build, we `cd', so get an absolute file name.
- if $tidy; then
- in_dir=$in_dir_abs
- fi
-
- # Strip directory part but leave extension.
- in_base=`basename "$command_line_filename"`
- # Strip extension.
- in_noext=`noext "$in_base"`
-
- # The normalized file name to compile. Must always point to the
- # file to actually compile (in case of recoding, macro-expansion etc.).
- in_input=$in_dir/$in_base
-
-
- # Compute the output file name.
- if test x"$oname" != x; then
- out_name=$oname
- else
- out_name=$in_noext.`out_lang_ext`
- fi
- out_dir=`func_dirname "$out_name"`
- out_dir_abs=`absolute "$out_dir"`
- out_base=`basename "$out_name"`
- out_noext=`noext "$out_base"`
-}
-
-
-## -------------- ##
-## TeXify files. ##
-## -------------- ##
-
-for command_line_filename
-do
- verbose "Processing $command_line_filename ..."
-
- input_file_name_decode
-
- # `texinfo' or `latex'?
- in_lang=`compute_language "$command_line_filename"`
-
- # An auxiliary directory used for all the auxiliary tasks involved
- # in compiling this document.
- case $build_dir in
- '' | . ) t2ddir=$out_noext.t2d ;;
- *) # Avoid collisions between multiple occurrences of the same
- # file, so depend on the output path. Remove leading `./',
- # at least to avoid creating a file starting with `.!', i.e.,
- # an invisible file. The sed expression is fragile if the cwd
- # has active characters. Transform / into ! so that we don't
- # need `mkdir -p'. It might be something to reconsider.
- t2ddir=$build_dir/`echo "$out_dir_abs/$out_noext.t2d" |
- sed "s,^$orig_pwd/,,;s,^\./,,;s,/,!,g"`
- esac
- # Remove it at exit if clean mode.
- trap "cleanup" 0 1 2 15
-
- ensure_dir "$build_dir" "$t2ddir"
-
- # We will change directory, better work with an absolute path...
- t2ddir=`absolute "$t2ddir"`
- # Sometimes there are incompatibilities between auxiliary files for
- # DVI and PDF. The contents can also change whether we work on PDF
- # and/or DVI. So keep separate spaces for each.
- workdir=$t2ddir/`out_lang_tex`
- ensure_dir "$workdir"
-
- # _build. In a tidy build, where the auxiliary files are output.
- if $tidy; then
- work_build=$workdir/build
- else
- work_build=.
- fi
-
- # _bak. Copies of the previous auxiliary files (another round is
- # run if they differ from the new ones).
- work_bak=$workdir/bak
-
- # Make those directories.
- ensure_dir "$work_build" "$work_bak"
-
- case $action in
- compile)
- # Compile the document.
- compile
- cleanup
- ;;
-
- mostly-clean)
- mostly_clean
- ;;
- esac
-done
-
-verbose "done."
-exit 0 # exit successfully, not however we ended the loop.
diff --git a/configure.ac b/configure.ac
index 074672f..8d281ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,9 +26,6 @@ AC_PREREQ([2.61])
AC_INIT([Olena], [1.0a], [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])
@@ -36,125 +33,14 @@ AC_CONFIG_FILES([build-aux/Makefile])
# Automake.
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
-# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
- [Package Full name.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
- [Bug report address.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_STRING], ["$PACKAGE_STRING"],
- [Full name and version.])
-AC_DEFINE_UNQUOTED([OLN_PACKAGE_VERSION], ["$PACKAGE_VERSION"],
- [Package Version.])
-
-## --------------------- ##
-## C++ compiler set up. ##
-## --------------------- ##
-
-# If the user doesn't provide any CXXFLAGS, prevent Autoconf from
-# settings its own default ones (e.g., `-g -O2' for g++).
-if test ! ${CXXFLAGS+set}; then
- CXXFLAGS=""
-fi
-
-# Look for a C++ compiler.
-AC_LANG([C++])
-AC_PROG_CXX
-
-# Set `ICPC' to `yes' if the Intel C++ compiler is used.
-test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes
-
-# GNU C++ compiler setup.
-if test "$GXX" = yes; then
- # Speed up compiling times.
- CXXFLAGS="$CXXFLAGS -pipe"
-
- # The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
- # a high optimization level (`-O3') and without
- # `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
- # Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
- #
- # So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
- # to `-fno-strict-aliasing'.
- if $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then
- STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing
- fi
-fi
-AC_SUBST([STRICT_ALIASING_CXXFLAGS])
-
-
-# Adjusting warning options according to compilers.
-AC_ARG_VAR([WARNINGS_CXXFLAGS], [C++ compiler warning flags])
-case "$CXX" in
- # Intel compiler
- *icpc*)
- WARNINGS_CXXFLAGS="-Wall -wd111,193,279,383,444,522,654,810,981,1418"
- ;;
- *)
- WARNINGS_CXXFLAGS="-Wall -W"
- ;;
-esac
-
-
-# ------------------------------ #
-# C++ compiler flags for tests. #
-# ------------------------------ #
-
-# FIXME: We might want to write an Autoconf macro to factor this.
-
-# Standard flags for tests.
-AC_ARG_VAR([TESTS_CXXFLAGS], [C++ compiler flags for tests])
-# We want no optimization for the tests (it slows down compiling
-# times), and debugging information.
-if test -z "$TESTS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS="-O0 -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for complex tests.
-AC_ARG_VAR([TESTS_CXXFLAGS_SPEED],
- [C++ compiler optimization flags for (complex) tests])
-# We want optimization for complex tests, and keep debugging flags
-# (still useful).
-if test -z "$TESTS_CXXFLAGS_SPEED"; then
- if test "$GXX" = yes; then
- # GNU C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- # Intel C++ compiler setup.
- TESTS_CXXFLAGS_SPEED="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-# Flags for tests with with all debugging features turned on.
-AC_ARG_VAR([TESTS_CXXFLAGS_DEBUG], [C++ compiler debug flags])
-# We want no optimization for the tests (it slows down compiling
-# times), and a lot of debugging features.
-# * GNU C++ Library Debug Mode:
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/debug_mode.html
-# * GNU C++ Library Compile Time Checks (a.k.a. concept checking):
-# http://gcc.gnu.org/onlinedocs/libstdc++/manual/bk01pt12ch29.html
-if test -z "$TESTS_CXXFLAGS_DEBUG"; then
- if test "$GXX" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -ggdb $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- elif test "$ICPC" = yes; then
- TESTS_CXXFLAGS_DEBUG="-O0 -g $WARNINGS_CXXFLAGS -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS"
- fi
-fi
+AC_CONFIG_FILES([Makefile])
## ------------------------------ ##
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (Swilena, Scribo, etc). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -163,91 +49,19 @@ fi
AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
- enable_trimesh=yes
enable_swilena=yes
dnl<<lrde
enable_scribo=yes
dnl>>
- enable_apps=yes
- enable_tools=yes
fi])
-## ------------------ ##
-## Libraries set up. ##
-## ------------------ ##
-
-# Use Libtool.
-# To be replaced by a call to LT_INIT as soon as Libtool 2.2 is used.
-AC_PROG_LIBTOOL
-
-# Check for Darwin.
-AC_CANONICAL_HOST
-AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin'])
-
-
-## -------------------- ##
-## External libraries. ##
-## -------------------- ##
-
-# ------- #
-# Boost. #
-# ------- #
-
-BOOST_TUPLE
-AM_CONDITIONAL([HAVE_BOOST_TUPLE],
- [test "x$ac_cv_header_boost_tuple_tuple_hpp" = xyes])
-
-# ----------------- #
-# CFITSIO library. #
-# ----------------- #
-
-OLN_WITH_LIB([CFITSIO], [fitsio.h], [cfitsio])
-
-# ---------- #
-# Magick++. #
-# ---------- #
-
-OLN_WITH_LIB_PKG_CONFIG([Magick++], [Magick++.h], [Magick++], [magickxx],
- [MAGICKXX], [], [ImageMagick++])
-
-# ---- #
-# Qt. #
-# ---- #
-
-AT_WITH_QT([xml], [], [], [:], [oln_have_qt=yes])
-if test x$oln_have_qt = xyes; then
- AT_REQUIRE_QT_VERSION([4],
- AC_MSG_WARN([Qt-dependent programs will be disabled.]),
- oln_have_expected_qt_version=yes)
-fi
-AM_CONDITIONAL([HAVE_QT], [test "x$oln_have_expected_qt_version" = xyes])
-
-# -------------- #
-# TIFF library. #
-# -------------- #
-
-OLN_WITH_LIB([TIFF], [tiff.h], [tiff])
-
-# --------------------------------- #
-# GDCM library (Grassroots DiCom). #
-# --------------------------------- #
-
-OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
- [GDCM],
- m4_do([-lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF],
- [ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
- [ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+## -------- ##
+## Milena. ##
+## -------- ##
-AC_ARG_ENABLE([trimesh],
- [AS_HELP_STRING([--enable-trimesh],
- [build the (bundled) trimesh2 library])])
-AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
+# Milena is always enabled.
+AC_CONFIG_SUBDIRS([milena])
## --------- ##
@@ -274,341 +88,4 @@ AC_CONFIG_SUBDIRS([scribo])
dnl>>
-## --------------- ##
-## Configuration. ##
-## --------------- ##
-
-# Ask for config.h creation.
-AC_CONFIG_HEADERS([config.h])
-
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
-# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
-
-# Ask for the Makefile creations.
-AC_CONFIG_FILES([
- Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
-])
-
-
-## ------- ##
-## Tests. ##
-## ------- ##
-
-# Ask for the creation of a milena/tests/data.hh, used to access to
-# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
-
-# Ask for the creation of tests' Makefiles.
-AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- 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/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
-])
-
-dnl<<lrde
-AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
-])
-dnl>>
-
-
-## -------------- ##
-## Applications. ##
-## -------------- ##
-
-# Ask for the creation of a milena/apps/data.hh, used to access to
-# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
-
-AC_ARG_ENABLE([apps],
- [AS_HELP_STRING([--enable-apps],
- [enable application])])
-AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
-
-# Ask for the creation of applications' Makefiles.
-AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
-])
-
-# Configure tests.
-# FIXME: Consider using `sed' instead of `configure' to create these
-# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
-
-# Flags for apps.
-AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
-# We want fast binaries for apps.
-if test -z "$APPS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- APPS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-## ------- ##
-## Tools. ##
-## ------- ##
-
-AC_ARG_ENABLE([tools],
- [AS_HELP_STRING([--enable-tools], [enable tools])])
-AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
-
-# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
-
-# Flags for tools.
-AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
-# We want fast binaries for tools.
-if test -z "$TOOLS_CXXFLAGS"; then
- if test "$GXX" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb $WARNINGS_CXXFLAGS"
- elif test "$ICPC" = yes; then
- TOOLS_CXXFLAGS="-O3 -DNDEBUG -g $WARNINGS_CXXFLAGS"
- fi
-fi
-
-
-## ----------------- ##
-## Verbose display. ##
-## ----------------- ##
-
-# Do not print this information by default, since `configure' outputs
-# should be kept short. Longer explanations are always available in
-# config.log.
-
-AC_ARG_ENABLE([verbose],
- [AS_HELP_STRING([--enable-verbose], [enable verbose display])],
- [if test "x$enable_verbose" != xno; then
- AC_MSG_RESULT([
--------------------------------------------------------------------------------
-Configuration summary.
-
-
-Host system type: $host
-Build system type: $build
-
-================
-| Dependencies |
-================
-
-
- Option Enabled and available
--------------------------------------------------------------------------------
-Boost Tuple --with-boost=@<:@=DIR@:>@ $oln_have_boost_tuple
-CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
-GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
-Magick++ --with-magickxx $oln_have_magickxx
-Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
-TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
--------------------------------------------------------------------------------
-
-
-
-
-=============
-| Utilities |
-=============
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Apps --enable-apps $enable_apps
-Tools --enable-tools $enable_tools
--------------------------------------------------------------------------------
-
-
-
-Options used to compile and link:
- PREFIX = $PREFIX_DIR
- EXEC-PREFIX = $EXEC_PREFIX_DIR
- VERSION = $PACKAGE_VERSION
- CC = $CC
- CFLAGS = $CFLAGS
- CPPFLAGS = $MAGICK_CPPFLAGS
- DEFS = $DEFS
- LDFLAGS = $LDFLAGS
- LIBS = $MAGICK_LIBS
- CXX = $CXX
- CXXFLAGS = $CXXFLAGS
- PKG_CONFIG = $PKG_CONFIG
- QT_PATH = $QT_PATH
- QMAKE = $QMAKE
- MOC = $MOC
- UIC = $UIC
- RCC = $RCC
- BOOST_ROOT = $BOOST_ROOT
- MAGICKXX_CFLAGS = $MAGICKXX_CPPFLAGS
- MAGICKXX_LIBS = $MAGICKXX_LDFLAGS
- APPS_CXXFLAGS = $APPS_CXXFLAGS
- TOOLS_CXXFLAGS = $TOOLS_CXXFLAGS
-
-
-
-*******************************************************************************
-Olena is configured as stated above. Please verify that this configuration
-matches your expectations.
-
-Then, type 'make' to build Olena and 'make install' to install it on
-your system.
-])
-fi])
-
-
-## -------- ##
-## Output. ##
-## -------- ##
-
AC_OUTPUT
--
1.5.6.5
13 years, 6 months
- 1
- 0
last-svn-commit-535-g3706c50 Autoconfiscate Milena.
by Roland Levillain
* configure.ac: New.
* Makefile.am (ACLOCAL_AMFLAGS): New.
(SUBDIRS): Add build-aux.
(LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
(dist-hook): New target.
* AUTHORS: New.
* NEWS: New (imported from Olena and updated).
* COPYING: New (imported from Olena).
* INSTALL: New (generated by Automake).
* README: New.
* m4/autotroll.m4,
* m4/boost.m4,
* m4/oln-with-lib.m4,
* m4/pkg.m4:
New (imported from Olena).
* build-aux/autotroll.mk,
* build-aux/build_unit_test.sh,
* build-aux/extra-recursive-targets.mk,
* build-aux/generate_dist_headers.sh,
* build-aux/regen-recursive.mk,
* build-aux/tex.mk,
* build-aux/texi2dvi:
New (imported from Olena).
* build-aux/Makefile.am: New.
* apps/constrained-connectivity/Makefile.am,
* apps/graph-morpho/Makefile.am,
* apps/mesh-segm-skel/Makefile.am,
* apps/papers/levillain.09.ismm/Makefile.am,
* doc/Makefile.am,
* mesh/Makefile.am,
* tests/Makefile.am,
* tests/accu/Makefile.am,
* tests/accu/image/Makefile.am,
* tests/accu/math/Makefile.am,
* tests/accu/shape/Makefile.am,
* tests/accu/site_set/Makefile.am,
* tests/accu/stat/Makefile.am,
* tests/algebra/Makefile.am,
* tests/arith/Makefile.am,
* tests/binarization/Makefile.am,
* tests/border/Makefile.am,
* tests/canvas/Makefile.am,
* tests/canvas/browsing/Makefile.am,
* tests/canvas/morpho/Makefile.am,
* tests/convert/Makefile.am,
* tests/convert/impl/Makefile.am,
* tests/core/Makefile.am,
* tests/core/alias/Makefile.am,
* tests/core/image/Makefile.am,
* tests/core/image/dmorph/Makefile.am,
* tests/core/image/imorph/Makefile.am,
* tests/core/image/vmorph/Makefile.am,
* tests/core/other/Makefile.am,
* tests/core/routine/Makefile.am,
* tests/core/site_set/Makefile.am,
* tests/data/Makefile.am,
* tests/data/approx/Makefile.am,
* tests/data/naive/Makefile.am,
* tests/debug/Makefile.am,
* tests/display/Makefile.am,
* tests/draw/Makefile.am,
* tests/estim/Makefile.am,
* tests/extension/Makefile.am,
* tests/extract/Makefile.am,
* tests/fun/Makefile.am,
* tests/fun/i2v/Makefile.am,
* tests/fun/p2b/Makefile.am,
* tests/fun/p2p/Makefile.am,
* tests/fun/p2v/Makefile.am,
* tests/fun/stat/Makefile.am,
* tests/fun/v2i/Makefile.am,
* tests/fun/v2v/Makefile.am,
* tests/fun/vv2v/Makefile.am,
* tests/fun/x2x/Makefile.am,
* tests/geom/Makefile.am,
* tests/graph/Makefile.am,
* tests/graph/attribute/Makefile.am,
* tests/histo/Makefile.am,
* tests/io/Makefile.am,
* tests/io/dicom/Makefile.am,
* tests/io/dump/Makefile.am,
* tests/io/fits/Makefile.am,
* tests/io/fld/Makefile.am,
* tests/io/magick/Makefile.am,
* tests/io/off/Makefile.am,
* tests/io/pbm/Makefile.am,
* tests/io/pbms/Makefile.am,
* tests/io/pfm/Makefile.am,
* tests/io/pgm/Makefile.am,
* tests/io/pgms/Makefile.am,
* tests/io/pnm/Makefile.am,
* tests/io/ppm/Makefile.am,
* tests/io/ppms/Makefile.am,
* tests/io/tiff/Makefile.am,
* tests/labeling/Makefile.am,
* tests/linear/Makefile.am,
* tests/linear/gaussian/Makefile.am,
* tests/linear/local/Makefile.am,
* tests/literal/Makefile.am,
* tests/logical/Makefile.am,
* tests/make/Makefile.am,
* tests/math/Makefile.am,
* tests/metal/Makefile.am,
* tests/metal/make/Makefile.am,
* tests/metal/math/Makefile.am,
* tests/morpho/Makefile.am,
* tests/morpho/approx/Makefile.am,
* tests/morpho/attribute/Makefile.am,
* tests/morpho/closing/Makefile.am,
* tests/morpho/closing/approx/Makefile.am,
* tests/morpho/elementary/Makefile.am,
* tests/morpho/opening/Makefile.am,
* tests/morpho/opening/approx/Makefile.am,
* tests/morpho/reconstruction/Makefile.am,
* tests/morpho/reconstruction/by_dilation/Makefile.am,
* tests/morpho/reconstruction/by_erosion/Makefile.am,
* tests/morpho/tree/Makefile.am,
* tests/morpho/tree/filter/Makefile.am,
* tests/morpho/watershed/Makefile.am,
* tests/norm/Makefile.am,
* tests/opt/Makefile.am,
* tests/pw/Makefile.am,
* tests/registration/Makefile.am,
* tests/set/Makefile.am,
* tests/subsampling/Makefile.am,
* tests/tag/Makefile.am,
* tests/test/Makefile.am,
* tests/topo/Makefile.am,
* tests/topo/skeleton/Makefile.am,
* tests/trace/Makefile.am,
* tests/trait/Makefile.am,
* tests/trait/image/Makefile.am,
* tests/trait/op/Makefile.am,
* tests/trait/value/Makefile.am,
* tests/transform/Makefile.am,
* tests/unit_test/Makefile.am,
* tests/upscaling/Makefile.am,
* tests/upscaling/art/Makefile.am,
* tests/util/Makefile.am,
* tests/value/Makefile.am,
* tests/value/builtin/Makefile.am,
* tests/value/concept/Makefile.am,
* tests/win/Makefile.am,
* tests/world/Makefile.am,
* tests/world/binary_2d/Makefile.am,
* tests/world/inter_pixel/Makefile.am,
* tests/world/inter_pixel/dim2/Makefile.am,
* tools/Makefile.am:
Adjust paths.
* tests/tests.mk,
* tools/tools.mk:
Likewise.
* apps/data.hh.in,
* doc/tools/data.hh.in,
* tests/data.hh.in:
Likewise.
* apps/constrained-connectivity/test-constrained-connectivity.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
* apps/mesh-segm-skel/test-mesh-complex-segm.in,
* apps/mesh-segm-skel/test-mesh-complex-skel.in,
* apps/mesh-segm-skel/test-mesh-max-curv.in,
* apps/mesh-segm-skel/test-mesh-segm.in:
Likewise.
* doc/Doxyfile.in,
* doc/gen-examples-outputs-mk,
* doc/gen-split-examples-mk,
* doc/programs-examples.mk,
* doc/tutorial.tex:
Likewise.
---
milena/.gitignore | 22 ++
milena/AUTHORS | 1 +
{scribo => milena}/COPYING | 0
milena/ChangeLog | 175 ++++++++++
INSTALL => milena/INSTALL | 0
milena/Makefile.am | 96 +++++
{scribo => milena}/NEWS | 6 +-
README => milena/README | 303 ++++-------------
milena/apps/constrained-connectivity/Makefile.am | 4 +-
.../test-constrained-connectivity.in | 2 +-
milena/apps/data.hh.in | 6 +-
milena/apps/graph-morpho/Makefile.am | 2 +-
milena/apps/mesh-segm-skel/Makefile.am | 10 +-
.../test-mesh-complex-max-curv-segm.in | 5 +-
.../mesh-segm-skel/test-mesh-complex-max-curv.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-segm.in | 5 +-
.../apps/mesh-segm-skel/test-mesh-complex-skel.in | 4 +-
milena/apps/mesh-segm-skel/test-mesh-max-curv.in | 5 +-
milena/apps/mesh-segm-skel/test-mesh-segm.in | 5 +-
milena/apps/papers/levillain.09.ismm/Makefile.am | 7 +-
{build-aux => milena/build-aux}/Makefile.am | 0
{scribo => milena}/build-aux/autotroll.mk | 0
{scribo => milena}/build-aux/build_unit_test.sh | 0
milena/build-aux/extra-recursive-targets.mk | 1 +
.../build-aux/generate_dist_headers.sh | 0
{scribo => milena}/build-aux/regen-recursive.mk | 0
milena/build-aux/strip-lrde | 1 +
{build-aux => milena/build-aux}/tex.mk | 0
{build-aux => milena/build-aux}/texi2dvi | 0
configure.ac => milena/configure.ac | 364 +++++++++-----------
milena/doc/Doxyfile.in | 32 +-
milena/doc/Makefile.am | 6 +-
milena/doc/gen-examples-outputs-mk | 2 +-
milena/doc/gen-split-examples-mk | 2 +-
milena/doc/programs-examples.mk | 6 +-
milena/doc/tools/data.hh.in | 2 +-
milena/doc/tutorial.tex | 17 +-
{scribo => milena}/m4/autotroll.m4 | 0
milena/m4/boost.m4 | 1 +
{scribo => milena}/m4/oln-with-lib.m4 | 0
{scribo => milena}/m4/pkg.m4 | 0
milena/mesh/Makefile.am | 15 +-
milena/tests/Makefile.am | 6 +-
milena/tests/accu/Makefile.am | 2 +-
milena/tests/accu/image/Makefile.am | 4 +-
milena/tests/accu/math/Makefile.am | 4 +-
milena/tests/accu/shape/Makefile.am | 4 +-
milena/tests/accu/site_set/Makefile.am | 4 +-
milena/tests/accu/stat/Makefile.am | 4 +-
milena/tests/algebra/Makefile.am | 5 +-
milena/tests/arith/Makefile.am | 4 +-
milena/tests/binarization/Makefile.am | 4 +-
milena/tests/border/Makefile.am | 4 +-
milena/tests/canvas/Makefile.am | 4 +-
milena/tests/canvas/browsing/Makefile.am | 4 +-
milena/tests/canvas/morpho/Makefile.am | 5 +-
milena/tests/convert/Makefile.am | 2 +-
milena/tests/convert/impl/Makefile.am | 4 +-
milena/tests/core/Makefile.am | 4 +-
milena/tests/core/alias/Makefile.am | 5 +-
milena/tests/core/image/Makefile.am | 4 +-
milena/tests/core/image/dmorph/Makefile.am | 4 +-
milena/tests/core/image/imorph/Makefile.am | 4 +-
milena/tests/core/image/vmorph/Makefile.am | 4 +-
milena/tests/core/other/Makefile.am | 5 +-
milena/tests/core/routine/Makefile.am | 5 +-
milena/tests/core/site_set/Makefile.am | 5 +-
milena/tests/data.hh.in | 8 +-
milena/tests/data/Makefile.am | 5 +-
milena/tests/data/approx/Makefile.am | 4 +-
milena/tests/data/naive/Makefile.am | 4 +-
milena/tests/debug/Makefile.am | 5 +-
milena/tests/display/Makefile.am | 4 +-
milena/tests/draw/Makefile.am | 4 +-
milena/tests/estim/Makefile.am | 4 +-
milena/tests/extension/Makefile.am | 5 +-
milena/tests/extract/Makefile.am | 4 +-
milena/tests/fun/Makefile.am | 4 +-
milena/tests/fun/i2v/Makefile.am | 5 +-
milena/tests/fun/p2b/Makefile.am | 5 +-
milena/tests/fun/p2p/Makefile.am | 4 +-
milena/tests/fun/p2v/Makefile.am | 5 +-
milena/tests/fun/stat/Makefile.am | 4 +-
milena/tests/fun/v2i/Makefile.am | 4 +-
milena/tests/fun/v2v/Makefile.am | 4 +-
milena/tests/fun/vv2v/Makefile.am | 5 +-
milena/tests/fun/x2x/Makefile.am | 4 +-
milena/tests/geom/Makefile.am | 2 +-
milena/tests/graph/Makefile.am | 4 +-
milena/tests/graph/attribute/Makefile.am | 4 +-
milena/tests/histo/Makefile.am | 4 +-
milena/tests/io/Makefile.am | 4 +-
milena/tests/io/dicom/Makefile.am | 4 +-
milena/tests/io/dump/Makefile.am | 2 +-
milena/tests/io/fits/Makefile.am | 2 +-
milena/tests/io/fld/Makefile.am | 5 +-
milena/tests/io/magick/Makefile.am | 2 +-
milena/tests/io/off/Makefile.am | 2 +-
milena/tests/io/pbm/Makefile.am | 2 +-
milena/tests/io/pbms/Makefile.am | 2 +-
milena/tests/io/pfm/Makefile.am | 5 +-
milena/tests/io/pgm/Makefile.am | 2 +-
milena/tests/io/pgms/Makefile.am | 2 +-
milena/tests/io/pnm/Makefile.am | 5 +-
milena/tests/io/ppm/Makefile.am | 2 +-
milena/tests/io/ppms/Makefile.am | 2 +-
milena/tests/io/tiff/Makefile.am | 4 +-
milena/tests/labeling/Makefile.am | 2 +-
milena/tests/linear/Makefile.am | 4 +-
milena/tests/linear/gaussian/Makefile.am | 2 +-
milena/tests/linear/local/Makefile.am | 4 +-
milena/tests/literal/Makefile.am | 4 +-
milena/tests/logical/Makefile.am | 4 +-
milena/tests/make/Makefile.am | 4 +-
milena/tests/math/Makefile.am | 5 +-
milena/tests/metal/Makefile.am | 4 +-
milena/tests/metal/make/Makefile.am | 5 +-
milena/tests/metal/math/Makefile.am | 4 +-
milena/tests/morpho/Makefile.am | 2 +-
milena/tests/morpho/approx/Makefile.am | 2 +-
milena/tests/morpho/attribute/Makefile.am | 4 +-
milena/tests/morpho/closing/Makefile.am | 2 +-
milena/tests/morpho/closing/approx/Makefile.am | 2 +-
milena/tests/morpho/elementary/Makefile.am | 5 +-
milena/tests/morpho/opening/Makefile.am | 2 +-
milena/tests/morpho/opening/approx/Makefile.am | 2 +-
milena/tests/morpho/reconstruction/Makefile.am | 4 +-
.../morpho/reconstruction/by_dilation/Makefile.am | 4 +-
.../morpho/reconstruction/by_erosion/Makefile.am | 4 +-
milena/tests/morpho/tree/Makefile.am | 5 +-
milena/tests/morpho/tree/filter/Makefile.am | 4 +-
milena/tests/morpho/watershed/Makefile.am | 2 +-
milena/tests/norm/Makefile.am | 5 +-
milena/tests/opt/Makefile.am | 5 +-
milena/tests/pw/Makefile.am | 4 +-
milena/tests/registration/Makefile.am | 5 +-
milena/tests/set/Makefile.am | 4 +-
milena/tests/subsampling/Makefile.am | 2 +-
milena/tests/tag/Makefile.am | 5 +-
milena/tests/test/Makefile.am | 5 +-
milena/tests/tests.mk | 8 +-
milena/tests/topo/Makefile.am | 5 +-
milena/tests/topo/skeleton/Makefile.am | 4 +-
milena/tests/trace/Makefile.am | 5 +-
milena/tests/trait/Makefile.am | 4 +-
milena/tests/trait/image/Makefile.am | 4 +-
milena/tests/trait/op/Makefile.am | 4 +-
milena/tests/trait/value/Makefile.am | 4 +-
milena/tests/transform/Makefile.am | 5 +-
milena/tests/unit_test/Makefile.am | 4 +-
milena/tests/upscaling/Makefile.am | 4 +-
milena/tests/upscaling/art/Makefile.am | 4 +-
milena/tests/util/Makefile.am | 4 +-
milena/tests/value/Makefile.am | 4 +-
milena/tests/value/builtin/Makefile.am | 2 +-
milena/tests/value/concept/Makefile.am | 5 +-
milena/tests/win/Makefile.am | 4 +-
milena/tests/world/Makefile.am | 4 +-
milena/tests/world/binary_2d/Makefile.am | 4 +-
milena/tests/world/inter_pixel/Makefile.am | 4 +-
milena/tests/world/inter_pixel/dim2/Makefile.am | 4 +-
milena/tools/Makefile.am | 5 +-
milena/tools/tools.mk | 2 +-
163 files changed, 848 insertions(+), 738 deletions(-)
create mode 120000 milena/AUTHORS
copy {scribo => milena}/COPYING (100%)
copy INSTALL => milena/INSTALL (100%)
copy {scribo => milena}/NEWS (99%)
copy README => milena/README (55%)
copy {build-aux => milena/build-aux}/Makefile.am (100%)
copy {scribo => milena}/build-aux/autotroll.mk (100%)
copy {scribo => milena}/build-aux/build_unit_test.sh (100%)
create mode 120000 milena/build-aux/extra-recursive-targets.mk
copy {scribo => milena}/build-aux/generate_dist_headers.sh (100%)
copy {scribo => milena}/build-aux/regen-recursive.mk (100%)
create mode 120000 milena/build-aux/strip-lrde
copy {build-aux => milena/build-aux}/tex.mk (100%)
copy {build-aux => milena/build-aux}/texi2dvi (100%)
copy configure.ac => milena/configure.ac (60%)
copy {scribo => milena}/m4/autotroll.m4 (100%)
create mode 120000 milena/m4/boost.m4
copy {scribo => milena}/m4/oln-with-lib.m4 (100%)
copy {scribo => milena}/m4/pkg.m4 (100%)
diff --git a/milena/.gitignore b/milena/.gitignore
index 8c2049a..7b3a5ed 100644
--- a/milena/.gitignore
+++ b/milena/.gitignore
@@ -1,3 +1,11 @@
+/build-aux/config.guess
+/build-aux/config.sub
+/build-aux/depcomp
+/build-aux/install-sh
+/build-aux/ltmain.sh
+/build-aux/missing
+/build-aux/py-compile
+
/doc/Doxyfile_user
/doc/user-refman
/doc/user-refman.pdf
@@ -16,4 +24,18 @@
/doc/white-paper.pdf
/doc/white-paper/
+/m4/libtool.m4
+/m4/ltoptions.m4
+/m4/ltsugar.m4
+/m4/ltversion.m4
+/m4/lt~obsolete.m4
+
/tests/unit_test/mln_*.cc
+
+/*aclocal.m4
+/autom4te.cache*
+/config.h
+/config.h?in*
+/config.hin
+/configure
+/configure.scan
diff --git a/milena/AUTHORS b/milena/AUTHORS
new file mode 120000
index 0000000..9eadf71
--- /dev/null
+++ b/milena/AUTHORS
@@ -0,0 +1 @@
+../AUTHORS
\ No newline at end of file
diff --git a/scribo/COPYING b/milena/COPYING
similarity index 100%
copy from scribo/COPYING
copy to milena/COPYING
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 2b6ae78..d5af4e2 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,3 +1,178 @@
+2010-10-27 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Autoconfiscate Milena.
+
+ * configure.ac: New.
+ * Makefile.am (ACLOCAL_AMFLAGS): New.
+ (SUBDIRS): Add build-aux.
+ (LRDE_STRIPPED_DIST_FILES, LRDE_NODIST_FILES): New.
+ (dist-hook): New target.
+ * AUTHORS: New.
+ * NEWS: New (imported from Olena and updated).
+ * COPYING: New (imported from Olena).
+ * INSTALL: New (generated by Automake).
+ * README: New.
+ * m4/autotroll.m4,
+ * m4/boost.m4,
+ * m4/oln-with-lib.m4,
+ * m4/pkg.m4:
+ New (imported from Olena).
+ * build-aux/autotroll.mk,
+ * build-aux/build_unit_test.sh,
+ * build-aux/extra-recursive-targets.mk,
+ * build-aux/generate_dist_headers.sh,
+ * build-aux/regen-recursive.mk,
+ * build-aux/tex.mk,
+ * build-aux/texi2dvi:
+ New (imported from Olena).
+ * build-aux/Makefile.am: New.
+ * apps/constrained-connectivity/Makefile.am,
+ * apps/graph-morpho/Makefile.am,
+ * apps/mesh-segm-skel/Makefile.am,
+ * apps/papers/levillain.09.ismm/Makefile.am,
+ * doc/Makefile.am,
+ * mesh/Makefile.am,
+ * tests/Makefile.am,
+ * tests/accu/Makefile.am,
+ * tests/accu/image/Makefile.am,
+ * tests/accu/math/Makefile.am,
+ * tests/accu/shape/Makefile.am,
+ * tests/accu/site_set/Makefile.am,
+ * tests/accu/stat/Makefile.am,
+ * tests/algebra/Makefile.am,
+ * tests/arith/Makefile.am,
+ * tests/binarization/Makefile.am,
+ * tests/border/Makefile.am,
+ * tests/canvas/Makefile.am,
+ * tests/canvas/browsing/Makefile.am,
+ * tests/canvas/morpho/Makefile.am,
+ * tests/convert/Makefile.am,
+ * tests/convert/impl/Makefile.am,
+ * tests/core/Makefile.am,
+ * tests/core/alias/Makefile.am,
+ * tests/core/image/Makefile.am,
+ * tests/core/image/dmorph/Makefile.am,
+ * tests/core/image/imorph/Makefile.am,
+ * tests/core/image/vmorph/Makefile.am,
+ * tests/core/other/Makefile.am,
+ * tests/core/routine/Makefile.am,
+ * tests/core/site_set/Makefile.am,
+ * tests/data/Makefile.am,
+ * tests/data/approx/Makefile.am,
+ * tests/data/naive/Makefile.am,
+ * tests/debug/Makefile.am,
+ * tests/display/Makefile.am,
+ * tests/draw/Makefile.am,
+ * tests/estim/Makefile.am,
+ * tests/extension/Makefile.am,
+ * tests/extract/Makefile.am,
+ * tests/fun/Makefile.am,
+ * tests/fun/i2v/Makefile.am,
+ * tests/fun/p2b/Makefile.am,
+ * tests/fun/p2p/Makefile.am,
+ * tests/fun/p2v/Makefile.am,
+ * tests/fun/stat/Makefile.am,
+ * tests/fun/v2i/Makefile.am,
+ * tests/fun/v2v/Makefile.am,
+ * tests/fun/vv2v/Makefile.am,
+ * tests/fun/x2x/Makefile.am,
+ * tests/geom/Makefile.am,
+ * tests/graph/Makefile.am,
+ * tests/graph/attribute/Makefile.am,
+ * tests/histo/Makefile.am,
+ * tests/io/Makefile.am,
+ * tests/io/dicom/Makefile.am,
+ * tests/io/dump/Makefile.am,
+ * tests/io/fits/Makefile.am,
+ * tests/io/fld/Makefile.am,
+ * tests/io/magick/Makefile.am,
+ * tests/io/off/Makefile.am,
+ * tests/io/pbm/Makefile.am,
+ * tests/io/pbms/Makefile.am,
+ * tests/io/pfm/Makefile.am,
+ * tests/io/pgm/Makefile.am,
+ * tests/io/pgms/Makefile.am,
+ * tests/io/pnm/Makefile.am,
+ * tests/io/ppm/Makefile.am,
+ * tests/io/ppms/Makefile.am,
+ * tests/io/tiff/Makefile.am,
+ * tests/labeling/Makefile.am,
+ * tests/linear/Makefile.am,
+ * tests/linear/gaussian/Makefile.am,
+ * tests/linear/local/Makefile.am,
+ * tests/literal/Makefile.am,
+ * tests/logical/Makefile.am,
+ * tests/make/Makefile.am,
+ * tests/math/Makefile.am,
+ * tests/metal/Makefile.am,
+ * tests/metal/make/Makefile.am,
+ * tests/metal/math/Makefile.am,
+ * tests/morpho/Makefile.am,
+ * tests/morpho/approx/Makefile.am,
+ * tests/morpho/attribute/Makefile.am,
+ * tests/morpho/closing/Makefile.am,
+ * tests/morpho/closing/approx/Makefile.am,
+ * tests/morpho/elementary/Makefile.am,
+ * tests/morpho/opening/Makefile.am,
+ * tests/morpho/opening/approx/Makefile.am,
+ * tests/morpho/reconstruction/Makefile.am,
+ * tests/morpho/reconstruction/by_dilation/Makefile.am,
+ * tests/morpho/reconstruction/by_erosion/Makefile.am,
+ * tests/morpho/tree/Makefile.am,
+ * tests/morpho/tree/filter/Makefile.am,
+ * tests/morpho/watershed/Makefile.am,
+ * tests/norm/Makefile.am,
+ * tests/opt/Makefile.am,
+ * tests/pw/Makefile.am,
+ * tests/registration/Makefile.am,
+ * tests/set/Makefile.am,
+ * tests/subsampling/Makefile.am,
+ * tests/tag/Makefile.am,
+ * tests/test/Makefile.am,
+ * tests/topo/Makefile.am,
+ * tests/topo/skeleton/Makefile.am,
+ * tests/trace/Makefile.am,
+ * tests/trait/Makefile.am,
+ * tests/trait/image/Makefile.am,
+ * tests/trait/op/Makefile.am,
+ * tests/trait/value/Makefile.am,
+ * tests/transform/Makefile.am,
+ * tests/unit_test/Makefile.am,
+ * tests/upscaling/Makefile.am,
+ * tests/upscaling/art/Makefile.am,
+ * tests/util/Makefile.am,
+ * tests/value/Makefile.am,
+ * tests/value/builtin/Makefile.am,
+ * tests/value/concept/Makefile.am,
+ * tests/win/Makefile.am,
+ * tests/world/Makefile.am,
+ * tests/world/binary_2d/Makefile.am,
+ * tests/world/inter_pixel/Makefile.am,
+ * tests/world/inter_pixel/dim2/Makefile.am,
+ * tools/Makefile.am:
+ Adjust paths.
+ * tests/tests.mk,
+ * tools/tools.mk:
+ Likewise.
+ * apps/data.hh.in,
+ * doc/tools/data.hh.in,
+ * tests/data.hh.in:
+ Likewise.
+ * apps/constrained-connectivity/test-constrained-connectivity.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-complex-segm.in,
+ * apps/mesh-segm-skel/test-mesh-complex-skel.in,
+ * apps/mesh-segm-skel/test-mesh-max-curv.in,
+ * apps/mesh-segm-skel/test-mesh-segm.in:
+ Likewise.
+ * doc/Doxyfile.in,
+ * doc/gen-examples-outputs-mk,
+ * doc/gen-split-examples-mk,
+ * doc/programs-examples.mk,
+ * doc/tutorial.tex:
+ Likewise.
+
2010-10-28 Roland Levillain <roland(a)lrde.epita.fr>
Handle properly non 8-bit Magick::Quantum's.
diff --git a/INSTALL b/milena/INSTALL
similarity index 100%
copy from INSTALL
copy to milena/INSTALL
diff --git a/milena/Makefile.am b/milena/Makefile.am
index 769006d..133cbad 100644
--- a/milena/Makefile.am
+++ b/milena/Makefile.am
@@ -15,7 +15,10 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = \
+ build-aux \
external \
doc \
mesh \
@@ -112,3 +115,96 @@ EXTRA_DIST += \
tests/img/test_rgb8.tif \
tests/img/test_bw.tif \
tests/img/test_gl.tif
+
+
+#<<lrde
+## FIXME: All of this it too much ad hoc. Use Git branches to
+## distinguish distributed files from non distributed ones after the
+## conversion of the repository.
+
+## FIXME: Moreover, this list is partially duplicated in Olena's
+## `Makefile.am', so that pruning also occurs both when rolling an
+## Olena tarball or a (standalone) Milena tarball.
+
+LRDE_STRIPPED_DIST_FILES = \
+ $(distdir)/Makefile.am \
+ $(distdir)/configure.ac \
+ $(distdir)/mln/accu/math/all.hh \
+ $(distdir)/mln/all.hh \
+ $(distdir)/mln/core/image/vmorph/all.hh \
+ $(distdir)/mln/core/image/vmorph/fun_image.hh \
+ $(distdir)/mln/data/all.hh \
+ $(distdir)/mln/essential/routine.hh \
+ $(distdir)/mln/fun/all.hh \
+ $(distdir)/mln/fun/essential.hh \
+ $(distdir)/mln/fun/v2v/all.hh \
+ $(distdir)/mln/fun/v2v/essential.hh \
+ $(distdir)/mln/linear/all.hh \
+ $(distdir)/mln/trait/all.hh \
+ $(distdir)/mln/trait/ch_value.hh \
+ $(distdir)/mln/value/all.hh \
+ $(distdir)/mln/value/essential.hh \
+ $(distdir)/tests/Makefile.am \
+ $(distdir)/tests/convert/Makefile.am \
+ $(distdir)/tests/extract/Makefile.am \
+ $(distdir)/tests/fun/v2v/Makefile.am \
+ $(distdir)/tests/linear/Makefile.am \
+ $(distdir)/tests/linear/gaussian/Makefile.am \
+ $(distdir)/tests/registration/Makefile.am \
+ $(distdir)/tests/trait/ch_value.cc \
+ $(distdir)/tests/value/Makefile.am
+
+LRDE_NODIST_FILES = \
+ $(distdir)/tests/convert/to_hsl.cc \
+ $(distdir)/tests/extract/blue.cc \
+ $(distdir)/tests/extract/green.cc \
+ $(distdir)/tests/extract/hue.cc \
+ $(distdir)/tests/extract/lum.cc \
+ $(distdir)/tests/extract/red.cc \
+ $(distdir)/tests/extract/sat.cc \
+ $(distdir)/tests/fun/v2v/component.cc \
+ $(distdir)/tests/fun/v2v/hsl_to_rgb.cc \
+ $(distdir)/tests/fun/v2v/rgb_to_hsl.cc \
+ $(distdir)/tests/linear/gaussian.cc \
+ $(distdir)/tests/linear/gaussian/filter.cc \
+ $(distdir)/tests/registration/registration.cc \
+ $(distdir)/tests/value/stack.cc
+
+## FIXME: Running `build-aux/build_unit_test.sh' just to update
+## `milena/tests/unit_test/unit-tests.mk' is overkill:
+##
+## 1. It recreates *all* the sources (more than 1200 `.cc' files!).
+## => We should just regen `unit-tests.mk', not the `.cc' files.
+##
+## 2. It visits (almost) all the directories and files under
+## milena/mln/ (which admittedly a smaller issue compared to the
+## previous one)
+## => Prune `unit-tests.mk' instead of regenerating it. The
+## simplest solution is probably to equip `unit-tests.mk' in the
+## first place with `<<lrde'/`>>' tags, then prune it with
+## dist-strip.
+##
+
+# Do not distribute parts tagged `lrde' (see build-aux/strip-lrde).
+# Then, regen files; and if the `distdir' (or `dist' or `distcheck')
+# target was run from Milena's (and not Olena's) source directory,
+# call `autoreconf'.
+dist-hook:
+ for f in $(LRDE_STRIPPED_DIST_FILES); do \
+ $(srcdir)/build-aux/strip-lrde $$f; \
+ done; \
+ rm -rf $(LRDE_NODIST_FILES) \
+ && $(srcdir)/build-aux/build_unit_test.sh \
+ $(distdir)/mln \
+ $(distdir)/tests/unit_test \
+ $(srcdir)/tests/unit_test/disabled_tests \
+ mln \
+ && if test x$(distdir) = x$(top_distdir); then \
+ ( \
+ cd $(distdir); \
+ set -evx; \
+ autoreconf -f -v -i; \
+ find . -name autom4te.cache | xargs rm -rf \
+ ) \
+ fi
+#>>
diff --git a/scribo/NEWS b/milena/NEWS
similarity index 99%
copy from scribo/NEWS
copy to milena/NEWS
index b7abbba..0a303c7 100644
--- a/scribo/NEWS
+++ b/milena/NEWS
@@ -1,11 +1,9 @@
-* Swilena 1.0a
+* Olena 1.0a
- * Starting with Olena 1.1, Scribo is an independent component
+ * Starting with Olena 1.1, Milena is an independent component
of the project, distributed both together with the Olena
package and as a standalone package.
- * Misc fixes and improvements.
-
* Olena 1.0 July 14, 2009
diff --git a/README b/milena/README
similarity index 55%
copy from README
copy to milena/README
index cc49a02..b351d0b 100644
--- a/README
+++ b/milena/README
@@ -19,63 +19,44 @@ The complete GNU General Public License Notice can also be found in
the 'COPYING' file in the root directory.
-=====================
-Introduction to Olena
-=====================
+======================
+Introduction to Milena
+======================
-Olena_, a platform dedicated to image processing.
+Milena is a part of Olena_, a generic and efficient platform
+dedicated to image processing.
.. _Olena: http://olena.lrde.epita.fr
+Milena is a generic C++ library and the core component of the Olena
+project.
---------
-Overview
---------
-
-Olena is a platform dedicated to image processing. At the moment it is
-mainly composed of a C++ library: Milena. This library features many
-tools to easily perform image processing tasks. Its main
-characteristic is its genericity: it allows to write an algorithm once
-and run it over many kinds of images (gray scale, color, 1D, 2D, 3D,
-...).
+Milena is distributed in two ways:
-Olena is a project developed by the `EPITA Research and Development
-Laboratory (LRDE)`__ since 1997. We did numerous prototypes and
-throwaway experiments before settling into the kind of programming
-paradigm which is finally here.
+ * as a component of the Olena package
-__ http://www.lrde.epita.fr
+ * and a standalone package.
-We do our image processing research using this library, but most
-importantly we have gathered (and still do) generic programming
-expertise from the library development.
+If you obtained Milena as an project embedded an Olena package, we
+advise you to read Olena's README, at the top-level directory of the
+package, and not to configure nor compile Milena separately (i.e., do
+not use `milena/configure', use the top-level `configure' instead
+and run `make' from the top-level directory).
-Yet, Olena is an ongoing development project. Few algorithms or
-definitions may change in a near future. A list of potential changes
-is maintained here :
-http://olena.lrde.epita.fr/FeaturesSubjectToChange.
+Otherwise, you are in the case of a standalone package, and you might
+want to read the rest of this file.
-Likewise, the documentation does not cover the whole project yet. In the
-`doc/' directory you will find the first draft of a reference
-manual. It includes a quick reference guide and a tutorial. This is a
-good start. In `milena/tools' and `milena/doc/examples' few sample
-programs are available. Most of them are already used to illustrate
-the tutorial. For the rest, we're afraid you will have to dig the
-code or e-mail us.
-
- Please direct any question or comments to <olena(a)lrde.epita.fr>, or
-<olena-bugs(a)lrde.epita.fr>.
-
- Olena also has a web page, located at
-<http://olena.lrde.epita.fr>.
+==========================================
+Detailed Instructions (Standalone Package)
+==========================================
-----------------
Required Software
-----------------
Here is a non-exhaustive list of required software required to build
-Olena successfully.
+Milena successfully.
* to compile the user examples:
@@ -85,51 +66,6 @@ Olena successfully.
- a `make' utility, like GNU `make'
-Optional:
-
- * to use various image types:
-
- - Magick++
-
- - libtiff
-
- - GDCM
-
-
-==================
-Quick Start Manual
-==================
-
-This section summarizes the installation procedure. For more
-information about building and installing Olena, see the next
-sections.
-
-To install Olena on your system, create a `_build' directory (even
-though it is not mandatory) and type in the classical sequence at the
-command prompt::
-
- mkdir _build
- cd _build
- ../configure
- make
- make install (as root)
-
-Note that an installation is specific to the compiler used to install
-it. Indeed, the call to ``../configure`` enables some workarounds
-and, consequently, users must compile with the same compiler to avoid
-compatibility problems.
-
-Between ``make`` and ``make install``, you may also want to run::
-
- make check
-
- ``make check`` will run the test suite to check the whole library.
-Running the test suite may require up several hours.
-
-
-=====================
-Detailed Instructions
-=====================
-------------
Configuration
@@ -138,10 +74,10 @@ Configuration
In order to prepare the build process, you need to configure the source
tree.
- Assuming your Olena distribution is uncompressed in directory
-`olena-1.0', follow these steps:
+ Assuming your Milena distribution is uncompressed in directory
+`milena-1.1', follow these steps:
- % cd olena-1.0
+ % cd milena-1.1
% mkdir _build
% cd _build
% ../configure
@@ -149,30 +85,11 @@ tree.
The build process can be altered by a number of options you can pass
to the `configure' script. The following sections describe them.
- Additionally, if you are an Olena maintainer (a person who runs
-`make distcheck'), _prefer setting `CXXFLAGS' as an environment
-variable_: the flags given on the command line to `configure' are not
-propagated to recursive runs by `make distcheck'. Or better: use the
-environment CONFIG_SITE to set up a configuration environment (see
-Autoconf's manual).
-
-
-Verbose Display
-===============
-
-A more verbose display can be turned on by passing the
-`--enable-verbose' flag to configure:
-
- % ../configure --enable-verbose
-
-Before configuring files, configure will display a summary of the
-configuration step.
-
Installation Path
=================
-By default, Olena is installed in the standard "local" directory of
+By default, Milena is installed in the standard "local" directory of
your system. This is usually `/usr/local' under Unix.
You can change this path with the following flag:
@@ -216,89 +133,6 @@ C++ flags by giving `configure' your selection of flags:
% ../configure CXXFLAGS="<your-favorite-flags>"
-Additional Components
-=====================
-
-In additional to Milena, several build targets can be enabled. These
-parts are called "components", and you can obtain a list of them by
-running:
-
- % ../configure --help
-
-Swilena
--------
-
-Swilena is an optional component of Olena exposing Milena to other
-languages thanks to the Simplified Wrapper and Interface Generator
-(SWIG_).
-
-.. _SWIG: http://www.swig.org
-
-For the moment, only some Python_ bindings are provided. They are
-disabled by default because they require extra dependencies (SWIG and
-Python).
-
-.. _Python: http://www.python.org
-
-To enable the installation of this module use::
-
- ./configure --enable-swilena
-
-Tools
------
-
-Sample tools are shipped with the tarball. To enable the installation of
-these tools use::
-
- ./configure --enable-tools
-
-Applications
-------------
-Sample applications are shipped with the tarball. To enable the
-installation of these applications use::
-
- ./configure --enable-apps
-
-Trimesh
--------
-
-Trimesh, a third-party library that we have been using to manipulate
-3D meshes, is shipped with Olena. (We will probably drop Trimesh from
-the distribution someday.) To enable it, use::
-
- ./configure --enable-trimesh
-
-Input/output libraries
-----------------------
-
-To read/write TIFF images with Olena, libtiff is required. If
-``configure`` is unable to find libtiff on your system, you can help
-it by specifying the base directory of libtiff, e.g.::
-
- ./configure --with-tiff=/usr/local
-
-To read/write DICOM images with Olena, GDCM is required. Likewise,
-you can tell ``configure`` where to find it by giving its install
-prefix, e.g.::
-
- ./configure --with-gdcm=/usr/local
-
-Olena use Magick++ to read and write images in common formats. As for
-other optional dependencies, you can specify where it is located (if
-needed) at configuration time::
-
- ./configure --with-magickxx=/usr/local/
-
-Other libraries
----------------
-
-The Boost Tuple library is used to implement a tuple accumulator
-class. This project is a part of the Boost libraries; you can help
-configure find these libraries using the `--with-boost flag':
-
- ./configure --with-boost=/usr/local/
-
-
--------
Building
--------
@@ -307,7 +141,7 @@ Once your build directory is `configure'd, you can run
% make
-to recursively build all the selected components.
+to build Milena.
Additionally, you can build and run the test suite with:
@@ -315,14 +149,14 @@ to recursively build all the selected components.
% make check
However, this process is time- and memory- consuming, and you probably
-do not need it except if you are developing/debugging Olena.
+do not need it except if you are developing/debugging Milena.
----------
Installing
----------
-To install the Olena headers and additional files on your system, run:
+To install Milena on your system, run:
% make install
@@ -336,89 +170,72 @@ from the build directory.
* sample images and meshes in `/usr/local/share/olena/images/',
- * the documentation in `/usr/local/share/doc/olena/`
-
-And optionally:
-
- * Swilena's Python bindings in `/usr/local/lib/python2.x/site-packages/',
-
- * Trimesh programs in `/usr/local/bin/',
+ * the documentation in `/usr/local/share/doc/olena/`.
- * Trimesh libraries in `/usr/local/lib/',
- * Trimesh headers in `/usr/local/share/trimesh/',
-
-
- You can later remove Olena from your system by running
+ You can later remove Milena from your system by running
% make uninstall
from the build directory (if you have kept it). We recommend the use
-of GNU Stow (or any similar program) during the installation of Olena,
-to make the uninstallation of Olena easier.
+of GNU Stow (or any similar program) during the installation of Milena,
+to make the uninstallation of Milena easier.
=====================
Layout of the Tarball
=====================
-The Olena project directory layout is as follows:
+The Milena project directory layout is as follows:
+
+apps
+ Application examples.
build-aux
Auxiliary tools used by the GNU Build System during ``configure``
and ``make`` stages.
-external
- Sources of Shipped dependencies.
-
-m4
- Extra Autoconf macros.
+demos
+ Demos of Milena.
-milena
+doc
+ Documentation.
- apps
- Application examples.
-
- mln
- Headers of the Milena library.
-
- tests
- The test suite.
-
- doc
- The documentation.
+external
+ Sources of bundled dependencies.
- tools
- Example tools.
+ trimesh
+ Trimesh2 library.
- mesh
- Some 3D meshes, mostly used for test purpose.
+img
+ Some (2D) images, mostly used for test purpose.
- img
- Some (2D) images, mostly used for test purpose.
+mesh
+ Some 3D meshes, mostly used for test purpose.
- demos
- Demos of Milena.
+mln
+ Headers of the Milena library.
-swilena
+tests
+ The test suite.
- python
- Some Python bindings for Milena.
+tools
+ Example tools.
===================
Supported Platforms
===================
-Olena has been tested on the following configurations:
+Milena has been tested on the following configurations:
=========================== =============================================
System Compiler
=========================== =============================================
-GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 3.4, 4.0, 4.1, 4.2 and 4.3
+GNU/Linux on IA-32 g++ (GNU GCC) 3.3, 4.1, 4.2 and 4.4
GNU/Linux on IA-32 icpc (Intel C/C++ Compiler) 10.1 and 11.0
GNU/Linux on AMD64/Intel 64 g++ (GNU GCC) 4.1
-Mac OS X (10.5) on IA-32 g++ (GNU GCC) 4.0.1
+Mac OS X (10.6) on IA-32 g++ (GNU GCC) 4.2.1
=========================== =============================================
@@ -433,7 +250,7 @@ To enable I/O with GDCM images, `GDCM`_ must be installed.
.. _GDCM: http://sourceforge.net/apps/mediawiki/gdcm/
-To support many image formats in Olena's I/O system, `Magick++`_ must
+To support many image formats in Milena's I/O system, `Magick++`_ must
be installed.
.. _Magick++: http://www.imagemagick.org/Magick++/
@@ -466,7 +283,7 @@ There are other sources of interest in the distribution.
License
=======
-Olena is released under the GNU General Public Licence. See the file
+Milena is released under the GNU General Public Licence. See the file
``COPYING`` (at the root of the source tree) for details.
@@ -487,7 +304,7 @@ mail address follows.
Bibliography
============
-Further information about Olena can be found into the following related
+Further information about Milena can be found into the following related
papers.
About Image Processing Programming:
diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am
index 84a6ed2..f5c563d 100644
--- a/milena/apps/constrained-connectivity/Makefile.am
+++ b/milena/apps/constrained-connectivity/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/constrained-connectivity/test-constrained-connectivity.in b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
index a0d6a88..42090b5 100644
--- a/milena/apps/constrained-connectivity/test-constrained-connectivity.in
+++ b/milena/apps/constrained-connectivity/test-constrained-connectivity.in
@@ -18,6 +18,6 @@
set -ex
-srcdir="@top_srcdir@/milena/apps/constrained-connectivity"
+srcdir="@top_srcdir@/apps/constrained-connectivity"
time ./constrained-connectivity "$srcdir/soille.pgm"
diff --git a/milena/apps/data.hh.in b/milena/apps/data.hh.in
index 8adb35f..8a64e47 100644
--- a/milena/apps/data.hh.in
+++ b/milena/apps/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,9 +33,9 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the apps directory of Milena.
-# define MLN_APPS_DIR "@abs_top_srcdir@/milena/apps/"
+# define MLN_APPS_DIR "@abs_top_srcdir@/apps"
#endif // ! APPS_DATA_HH
diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am
index 7e3d4db..8f2e551 100644
--- a/milena/apps/graph-morpho/Makefile.am
+++ b/milena/apps/graph-morpho/Makefile.am
@@ -15,7 +15,7 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am
index 78bc7ca..7794c48 100644
--- a/milena/apps/mesh-segm-skel/Makefile.am
+++ b/milena/apps/mesh-segm-skel/Makefile.am
@@ -16,12 +16,12 @@
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
# Linking with gluit and GLUT/OpenGL.
-gluit_builddir = $(top_builddir)/milena/external/trimesh/gluit
-include $(top_srcdir)/milena/external/trimesh/gluit/gluit.mk
+gluit_builddir = $(top_builddir)/external/trimesh/gluit
+include $(top_srcdir)/external/trimesh/gluit/gluit.mk
# Find Milena and trimesh headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
-CPPFLAGS_trimesh = -I$(top_srcdir)/milena/external/trimesh/include
+AM_CPPFLAGS = -I$(top_srcdir)
+CPPFLAGS_trimesh = -I$(top_srcdir)/external/trimesh/include
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -32,7 +32,7 @@ AM_CXXFLAGS = $(APPS_CXXFLAGS)
# LDFLAGS_trimesh instead. Likewise for CPPFLAGS_trimesh and
# LDADD_trimesh, for symmetry reasons.
LDFLAGS_trimesh = $(GLFLAGS)
-LDADD_trimesh = -L$(top_builddir)/milena/external/trimesh/libsrc -ltrimesh $(GLLIBS)
+LDADD_trimesh = -L$(top_builddir)/external/trimesh/libsrc -ltrimesh $(GLLIBS)
bin_PROGRAMS =
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
index ac5a1e7..09ed25b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv-segm $mesh_dir/socket.off 25 socket-complex-max-curv-segm.off
time ./mesh-complex-max-curv-segm $mesh_dir/teapot.off 50 teapot-complex-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
index a60eede..dd29cfe 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-max-curv $mesh_dir/teapot.off teapot-complex-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
index 58cd47e..8b72ae8 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-segm $mesh_dir/socket-max-curv.off 25 socket-max-curv-segm.off
time ./mesh-complex-segm $mesh_dir/teapot-max-curv.off 50 teapot-max-curv-segm.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
index f6b787b..a4a711f 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-complex-skel.in
@@ -1,6 +1,6 @@
#! /bin/sh
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +18,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-complex-skel $mesh_dir/three-triangles.off 1 three-triangles-skel.off
time ./mesh-complex-skel $mesh_dir/socket-max-curv.off 10 socket-max-curv-skel.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
index e5eaf96..00c554b 100644
--- a/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-max-curv.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,6 +19,6 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-max-curv $mesh_dir/teapot.off teapot-max-curv.off
diff --git a/milena/apps/mesh-segm-skel/test-mesh-segm.in b/milena/apps/mesh-segm-skel/test-mesh-segm.in
index e70e63a..3038a6c 100755
--- a/milena/apps/mesh-segm-skel/test-mesh-segm.in
+++ b/milena/apps/mesh-segm-skel/test-mesh-segm.in
@@ -1,6 +1,7 @@
#! /bin/sh
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -18,7 +19,7 @@
set -ex
-mesh_dir=@top_srcdir@/milena/mesh
+mesh_dir=@top_srcdir@/mesh
time ./mesh-segm $mesh_dir/socket.off 25 socket-segm.off
time ./mesh-segm $mesh_dir/teapot.off 50 teapot-segm.off
diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am
index ec5d328..4dd172b 100644
--- a/milena/apps/papers/levillain.09.ismm/Makefile.am
+++ b/milena/apps/papers/levillain.09.ismm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -17,7 +18,7 @@
# Illustrations from the ISMM 2009 paper.
# Find Milena headers.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# Produce fast code.
APPS_CXXFLAGS = @APPS_CXXFLAGS@
AM_CXXFLAGS = $(APPS_CXXFLAGS)
@@ -37,7 +38,7 @@ dist_noinst_DATA = seeds.pgm m283-c.off
noinst_DATA = lena-s.ppm graph-s.png m283-s.off
MOSTLYCLEANFILES = $(noinst_DATA) graph-s.neato
-lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT)
+lena-s.ppm: $(top_srcdir)/img/lena.pgm image2d$(EXEEXT)
./image2d$(EXEEXT) $< 1000 $@
graph-s.png: graph-s.neato
diff --git a/build-aux/Makefile.am b/milena/build-aux/Makefile.am
similarity index 100%
copy from build-aux/Makefile.am
copy to milena/build-aux/Makefile.am
diff --git a/scribo/build-aux/autotroll.mk b/milena/build-aux/autotroll.mk
similarity index 100%
copy from scribo/build-aux/autotroll.mk
copy to milena/build-aux/autotroll.mk
diff --git a/scribo/build-aux/build_unit_test.sh b/milena/build-aux/build_unit_test.sh
similarity index 100%
copy from scribo/build-aux/build_unit_test.sh
copy to milena/build-aux/build_unit_test.sh
diff --git a/milena/build-aux/extra-recursive-targets.mk b/milena/build-aux/extra-recursive-targets.mk
new file mode 120000
index 0000000..dabc25d
--- /dev/null
+++ b/milena/build-aux/extra-recursive-targets.mk
@@ -0,0 +1 @@
+../../build-aux/extra-recursive-targets.mk
\ No newline at end of file
diff --git a/scribo/build-aux/generate_dist_headers.sh b/milena/build-aux/generate_dist_headers.sh
similarity index 100%
copy from scribo/build-aux/generate_dist_headers.sh
copy to milena/build-aux/generate_dist_headers.sh
diff --git a/scribo/build-aux/regen-recursive.mk b/milena/build-aux/regen-recursive.mk
similarity index 100%
copy from scribo/build-aux/regen-recursive.mk
copy to milena/build-aux/regen-recursive.mk
diff --git a/milena/build-aux/strip-lrde b/milena/build-aux/strip-lrde
new file mode 120000
index 0000000..11926a1
--- /dev/null
+++ b/milena/build-aux/strip-lrde
@@ -0,0 +1 @@
+../../build-aux/strip-lrde
\ No newline at end of file
diff --git a/build-aux/tex.mk b/milena/build-aux/tex.mk
similarity index 100%
copy from build-aux/tex.mk
copy to milena/build-aux/tex.mk
diff --git a/build-aux/texi2dvi b/milena/build-aux/texi2dvi
similarity index 100%
copy from build-aux/texi2dvi
copy to milena/build-aux/texi2dvi
diff --git a/configure.ac b/milena/configure.ac
similarity index 60%
copy from configure.ac
copy to milena/configure.ac
index 074672f..8ae6c3e 100644
--- a/configure.ac
+++ b/milena/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.61])
## Package set up. ##
## ---------------- ##
-AC_INIT([Olena], [1.0a], [olena(a)lrde.epita.fr], [olena])
+AC_INIT([Milena], [1.0a], [olena(a)lrde.epita.fr], [milena])
# M4 macros.
AC_CONFIG_MACRO_DIR([m4])
@@ -37,7 +37,7 @@ AC_CONFIG_FILES([build-aux/Makefile])
AM_INIT_AUTOMAKE([1.10 subdir-objects check-news dist-bzip2 nostdinc -Wall])
# Package metadata.
-AC_CONFIG_FILES([milena/mln/version.hh])
+AC_CONFIG_FILES([mln/version.hh])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_NAME], ["$PACKAGE_NAME"],
[Package Full name.])
AC_DEFINE_UNQUOTED([OLN_PACKAGE_BUGREPORT], ["$PACKAGE_BUGREPORT"],
@@ -72,8 +72,8 @@ if test "$GXX" = yes; then
# The code generated for mln::data::impl::memcpy__() by g++ 4.2 with
# a high optimization level (`-O3') and without
# `-fno-strict-aliasing' might be wrong, at least with Debian's g++
- # 4.2 on IA-32 (see also milena/mln/memcpy_.hh). We observed this
- # behavior with e.g. milena/apps/graph-morpho/samples-image2d.cc.
+ # 4.2 on IA-32 (see also mln/memcpy_.hh). We observed this
+ # behavior with e.g. apps/graph-morpho/samples-image2d.cc.
# Note that Debian's g++ 4.0, 4.1, 4.3 and 4.4 are fine.
#
# So, when the C++ compiler is g++ 4.2, set STRICT_ALIASING_CXXFLAGS
@@ -154,7 +154,7 @@ fi
## ``Enable Everything'' Switch. ##
## ------------------------------ ##
-# Enable all bundled features (trimesh2, Swilena, apps, tools). This
+# Enable all bundled features (trimesh2, apps, tools). This
# option is useful to maintainers to ensure they do not break optional
# parts while modifying the core of the project. If both
# ``--enable-all'' is set and a given feature is disabled (say,
@@ -164,10 +164,6 @@ AC_ARG_ENABLE([all],
[AS_HELP_STRING([--enable-all], [enable maintainer mode])],
[if test "x$enable_all" != xno; then
enable_trimesh=yes
- enable_swilena=yes
-dnl<<lrde
- enable_scribo=yes
-dnl>>
enable_apps=yes
enable_tools=yes
fi])
@@ -239,39 +235,22 @@ OLN_WITH_LIB([GDCM], [gdcm-2.0/gdcmReader.h], [gdcmCommon], [gdcm],
[ -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8],
[ -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib]))
-# ---------------------------- #
-# (Bundled) trimesh2 library. #
-# ---------------------------- #
+
+## ---------------------------- ##
+## External, bundled projects. ##
+## ---------------------------- ##
+
+AC_CONFIG_FILES([external/Makefile])
+
+# ------------------ ##
+# Trimesh2 library. ##
+# ------------------ ##
AC_ARG_ENABLE([trimesh],
[AS_HELP_STRING([--enable-trimesh],
[build the (bundled) trimesh2 library])])
AM_CONDITIONAL([ENABLE_TRIMESH], [test "x$enable_trimesh" = xyes])
-AC_CONFIG_SUBDIRS([milena/external/trimesh])
-
-
-## --------- ##
-## Swilena. ##
-## --------- ##
-
-AC_ARG_ENABLE([swilena],
- [AS_HELP_STRING([--enable-swilena],
- [build Swilena Python bindings])])
-AM_CONDITIONAL([ENABLE_SWILENA], [test "x$enable_swilena" = xyes])
-AC_CONFIG_SUBDIRS([swilena])
-
-
-dnl<<lrde
-## -------- ##
-## Scribo. ##
-## -------- ##
-
-AC_ARG_ENABLE([scribo],
- [AS_HELP_STRING([--enable-scribo],
- [enable Scribo])])
-AM_CONDITIONAL([ENABLE_SCRIBO], [test "x$enable_scribo" = xyes])
-AC_CONFIG_SUBDIRS([scribo])
-dnl>>
+AC_CONFIG_SUBDIRS([external/trimesh])
## --------------- ##
@@ -281,17 +260,15 @@ dnl>>
# Ask for config.h creation.
AC_CONFIG_HEADERS([config.h])
-# Ask for the creation of a milena/doc/tool/data.hh, used to access to
+# Ask for the creation of a doc/tool/data.hh, used to access to
# data (images) from the documentation.
-AC_CONFIG_FILES([milena/doc/tools/data.hh])
+AC_CONFIG_FILES([doc/tools/data.hh])
# Ask for the Makefile creations.
AC_CONFIG_FILES([
Makefile
- milena/Makefile
- milena/doc/Makefile
- milena/external/Makefile
- milena/mesh/Makefile
+ doc/Makefile
+ mesh/Makefile
])
@@ -299,132 +276,132 @@ AC_CONFIG_FILES([
## Tests. ##
## ------- ##
-# Ask for the creation of a milena/tests/data.hh, used to access to
+# Ask for the creation of a tests/data.hh, used to access to
# data (images) from tests.
-AC_CONFIG_FILES([milena/tests/data.hh])
+AC_CONFIG_FILES([tests/data.hh])
# Ask for the creation of tests' Makefiles.
AC_CONFIG_FILES([
- milena/tests/Makefile
- milena/tests/accu/Makefile
- milena/tests/accu/image/Makefile
- milena/tests/accu/site_set/Makefile
- milena/tests/accu/stat/Makefile
- milena/tests/accu/math/Makefile
- milena/tests/accu/shape/Makefile
- milena/tests/algebra/Makefile
- milena/tests/arith/Makefile
- milena/tests/binarization/Makefile
- milena/tests/border/Makefile
- milena/tests/canvas/Makefile
- milena/tests/canvas/browsing/Makefile
- milena/tests/canvas/morpho/Makefile
- milena/tests/convert/Makefile
- milena/tests/convert/impl/Makefile
- milena/tests/core/Makefile
- milena/tests/core/alias/Makefile
- milena/tests/core/image/Makefile
- milena/tests/core/image/dmorph/Makefile
- milena/tests/core/image/imorph/Makefile
- milena/tests/core/image/vmorph/Makefile
- milena/tests/core/other/Makefile
- milena/tests/core/routine/Makefile
- milena/tests/core/site_set/Makefile
- milena/tests/data/Makefile
- milena/tests/data/approx/Makefile
- milena/tests/data/naive/Makefile
- milena/tests/debug/Makefile
- milena/tests/display/Makefile
- milena/tests/draw/Makefile
- milena/tests/estim/Makefile
- milena/tests/extension/Makefile
- 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/stat/Makefile
- milena/tests/fun/v2v/Makefile
- milena/tests/fun/vv2v/Makefile
- milena/tests/fun/x2x/Makefile
- milena/tests/geom/Makefile
- milena/tests/graph/Makefile
- milena/tests/graph/attribute/Makefile
- milena/tests/histo/Makefile
- milena/tests/io/Makefile
- milena/tests/io/dicom/Makefile
- milena/tests/io/dump/Makefile
- milena/tests/io/fits/Makefile
- milena/tests/io/fld/Makefile
- milena/tests/io/magick/Makefile
- milena/tests/io/off/Makefile
- milena/tests/io/pbm/Makefile
- milena/tests/io/pbms/Makefile
- milena/tests/io/pfm/Makefile
- milena/tests/io/pgm/Makefile
- milena/tests/io/pgms/Makefile
- milena/tests/io/pnm/Makefile
- milena/tests/io/ppm/Makefile
- milena/tests/io/ppms/Makefile
- milena/tests/io/tiff/Makefile
- milena/tests/labeling/Makefile
- milena/tests/linear/Makefile
- milena/tests/linear/local/Makefile
- milena/tests/literal/Makefile
- milena/tests/logical/Makefile
- milena/tests/make/Makefile
- milena/tests/math/Makefile
- milena/tests/metal/Makefile
- milena/tests/metal/make/Makefile
- milena/tests/metal/math/Makefile
- milena/tests/morpho/Makefile
- milena/tests/morpho/approx/Makefile
- milena/tests/morpho/attribute/Makefile
- milena/tests/morpho/closing/Makefile
- milena/tests/morpho/closing/approx/Makefile
- milena/tests/morpho/elementary/Makefile
- milena/tests/morpho/opening/Makefile
- milena/tests/morpho/opening/approx/Makefile
- milena/tests/morpho/reconstruction/Makefile
- milena/tests/morpho/reconstruction/by_dilation/Makefile
- milena/tests/morpho/reconstruction/by_erosion/Makefile
- milena/tests/morpho/tree/Makefile
- milena/tests/morpho/tree/filter/Makefile
- milena/tests/morpho/watershed/Makefile
- milena/tests/norm/Makefile
- milena/tests/opt/Makefile
- milena/tests/pw/Makefile
- milena/tests/set/Makefile
- milena/tests/tag/Makefile
- milena/tests/test/Makefile
- milena/tests/topo/Makefile
- milena/tests/topo/skeleton/Makefile
- milena/tests/trace/Makefile
- milena/tests/trait/Makefile
- milena/tests/trait/image/Makefile
- milena/tests/trait/op/Makefile
- milena/tests/trait/value/Makefile
- milena/tests/transform/Makefile
- milena/tests/unit_test/Makefile
- milena/tests/upscaling/Makefile
- milena/tests/upscaling/art/Makefile
- milena/tests/util/Makefile
- milena/tests/value/Makefile
- milena/tests/value/builtin/Makefile
- milena/tests/value/concept/Makefile
- milena/tests/win/Makefile
- milena/tests/world/Makefile
- milena/tests/world/binary_2d/Makefile
- milena/tests/world/inter_pixel/Makefile
- milena/tests/world/inter_pixel/dim2/Makefile
+ tests/Makefile
+ tests/accu/Makefile
+ tests/accu/image/Makefile
+ tests/accu/site_set/Makefile
+ tests/accu/stat/Makefile
+ tests/accu/math/Makefile
+ tests/accu/shape/Makefile
+ tests/algebra/Makefile
+ tests/arith/Makefile
+ tests/binarization/Makefile
+ tests/border/Makefile
+ tests/canvas/Makefile
+ tests/canvas/browsing/Makefile
+ tests/canvas/morpho/Makefile
+ tests/convert/Makefile
+ tests/convert/impl/Makefile
+ tests/core/Makefile
+ tests/core/alias/Makefile
+ tests/core/image/Makefile
+ tests/core/image/dmorph/Makefile
+ tests/core/image/imorph/Makefile
+ tests/core/image/vmorph/Makefile
+ tests/core/other/Makefile
+ tests/core/routine/Makefile
+ tests/core/site_set/Makefile
+ tests/data/Makefile
+ tests/data/approx/Makefile
+ tests/data/naive/Makefile
+ tests/debug/Makefile
+ tests/display/Makefile
+ tests/draw/Makefile
+ tests/estim/Makefile
+ tests/extension/Makefile
+ tests/fun/Makefile
+ tests/fun/i2v/Makefile
+ tests/fun/p2b/Makefile
+ tests/fun/p2p/Makefile
+ tests/fun/p2v/Makefile
+ tests/fun/stat/Makefile
+ tests/fun/v2v/Makefile
+ tests/fun/vv2v/Makefile
+ tests/fun/x2x/Makefile
+ tests/geom/Makefile
+ tests/graph/Makefile
+ tests/graph/attribute/Makefile
+ tests/histo/Makefile
+ tests/io/Makefile
+ tests/io/dicom/Makefile
+ tests/io/dump/Makefile
+ tests/io/fits/Makefile
+ tests/io/fld/Makefile
+ tests/io/magick/Makefile
+ tests/io/off/Makefile
+ tests/io/pbm/Makefile
+ tests/io/pbms/Makefile
+ tests/io/pfm/Makefile
+ tests/io/pgm/Makefile
+ tests/io/pgms/Makefile
+ tests/io/pnm/Makefile
+ tests/io/ppm/Makefile
+ tests/io/ppms/Makefile
+ tests/io/tiff/Makefile
+ tests/labeling/Makefile
+ tests/linear/Makefile
+ tests/linear/local/Makefile
+ tests/literal/Makefile
+ tests/logical/Makefile
+ tests/make/Makefile
+ tests/math/Makefile
+ tests/metal/Makefile
+ tests/metal/make/Makefile
+ tests/metal/math/Makefile
+ tests/morpho/Makefile
+ tests/morpho/approx/Makefile
+ tests/morpho/attribute/Makefile
+ tests/morpho/closing/Makefile
+ tests/morpho/closing/approx/Makefile
+ tests/morpho/elementary/Makefile
+ tests/morpho/opening/Makefile
+ tests/morpho/opening/approx/Makefile
+ tests/morpho/reconstruction/Makefile
+ tests/morpho/reconstruction/by_dilation/Makefile
+ tests/morpho/reconstruction/by_erosion/Makefile
+ tests/morpho/tree/Makefile
+ tests/morpho/tree/filter/Makefile
+ tests/morpho/watershed/Makefile
+ tests/norm/Makefile
+ tests/opt/Makefile
+ tests/pw/Makefile
+ tests/set/Makefile
+ tests/tag/Makefile
+ tests/test/Makefile
+ tests/topo/Makefile
+ tests/topo/skeleton/Makefile
+ tests/trace/Makefile
+ tests/trait/Makefile
+ tests/trait/image/Makefile
+ tests/trait/op/Makefile
+ tests/trait/value/Makefile
+ tests/transform/Makefile
+ tests/unit_test/Makefile
+ tests/upscaling/Makefile
+ tests/upscaling/art/Makefile
+ tests/util/Makefile
+ tests/value/Makefile
+ tests/value/builtin/Makefile
+ tests/value/concept/Makefile
+ tests/win/Makefile
+ tests/world/Makefile
+ tests/world/binary_2d/Makefile
+ tests/world/inter_pixel/Makefile
+ tests/world/inter_pixel/dim2/Makefile
])
dnl<<lrde
AC_CONFIG_FILES([
- milena/tests/extract/Makefile
- milena/tests/linear/gaussian/Makefile
- milena/tests/registration/Makefile
- milena/tests/subsampling/Makefile
+ tests/extract/Makefile
+ tests/linear/gaussian/Makefile
+ tests/registration/Makefile
+ tests/subsampling/Makefile
])
dnl>>
@@ -433,9 +410,9 @@ dnl>>
## Applications. ##
## -------------- ##
-# Ask for the creation of a milena/apps/data.hh, used to access to
+# Ask for the creation of a apps/data.hh, used to access to
# data (images) from apps.
-AC_CONFIG_FILES([milena/apps/data.hh])
+AC_CONFIG_FILES([apps/data.hh])
AC_ARG_ENABLE([apps],
[AS_HELP_STRING([--enable-apps],
@@ -444,32 +421,32 @@ AM_CONDITIONAL([ENABLE_APPS], [test "x$enable_apps" = "xyes"])
# Ask for the creation of applications' Makefiles.
AC_CONFIG_FILES([
- milena/apps/Makefile
- milena/apps/constrained-connectivity/Makefile
- milena/apps/graph-morpho/Makefile
- milena/apps/mesh-segm-skel/Makefile
- milena/apps/papers/Makefile
- milena/apps/papers/levillain.09.ismm/Makefile
+ apps/Makefile
+ apps/constrained-connectivity/Makefile
+ apps/graph-morpho/Makefile
+ apps/mesh-segm-skel/Makefile
+ apps/papers/Makefile
+ apps/papers/levillain.09.ismm/Makefile
])
# Configure tests.
# FIXME: Consider using `sed' instead of `configure' to create these
# tests for the sake of speed.
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
-AC_CONFIG_FILES([milena/apps/mesh-segm-skel/test-mesh-complex-skel],
- [chmod +x milena/apps/mesh-segm-skel/test-mesh-complex-skel])
-
-AC_CONFIG_FILES([milena/apps/constrained-connectivity/test-constrained-connectivity],
- [chmod +x milena/apps/constrained-connectivity/test-constrained-connectivity])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-max-curv-segm],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-max-curv-segm])
+AC_CONFIG_FILES([apps/mesh-segm-skel/test-mesh-complex-skel],
+ [chmod +x apps/mesh-segm-skel/test-mesh-complex-skel])
+
+AC_CONFIG_FILES([apps/constrained-connectivity/test-constrained-connectivity],
+ [chmod +x apps/constrained-connectivity/test-constrained-connectivity])
# Flags for apps.
AC_ARG_VAR([APPS_CXXFLAGS], [C++ compiler flags for applications])
@@ -491,7 +468,7 @@ AC_ARG_ENABLE([tools],
AM_CONDITIONAL([ENABLE_TOOLS], [test "x$enable_tools" = "xyes"])
# Ask for the creation of tools' Makefiles.
-AC_CONFIG_FILES([milena/tools/Makefile])
+AC_CONFIG_FILES([tools/Makefile])
# Flags for tools.
AC_ARG_VAR([TOOLS_CXXFLAGS], [C++ compiler flags for tools])
@@ -536,23 +513,8 @@ CFITSIO --with-cfitsio@<:@=DIR@:>@ $oln_have_cfitsio
GDCM --with-gdcm@<:@=DIR@:>@ $oln_have_gdcm
Magick++ --with-magickxx $oln_have_magickxx
Qt --with-qt $oln_have_qt
-Tesseract --with-tesseract@<:@=DIR@:>@ $oln_have_tesseract
TIFF --with-tiff@<:@=DIR@:>@ $oln_have_tiff
-Trimesh --enable-trimesh $enable_trimesh
--------------------------------------------------------------------------------
-
-
-
-
-===========
-| Modules |
-===========
-
-
- Option Enabled
--------------------------------------------------------------------------------
-Scribo --enable-scribo $enable_scribo
-Swilena --enable-swilena $enable_swilena
+Trimesh --enable-trimesh enable_trimesh
-------------------------------------------------------------------------------
diff --git a/milena/doc/Doxyfile.in b/milena/doc/Doxyfile.in
index 5b20a7c..7821071 100644
--- a/milena/doc/Doxyfile.in
+++ b/milena/doc/Doxyfile.in
@@ -31,7 +31,7 @@ ABBREVIATE_BRIEF =
ALWAYS_DETAILED_SEC = YES
INLINE_INHERITED_MEMB = YES
FULL_PATH_NAMES = NO
-STRIP_FROM_PATH = @top_srcdir@/milena
+STRIP_FROM_PATH = @top_srcdir@
STRIP_FROM_INC_PATH =
SHORT_NAMES = YES
JAVADOC_AUTOBRIEF = YES
@@ -91,33 +91,33 @@ WARN_LOGFILE =
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = @top_srcdir@/milena
+INPUT = @top_srcdir@
FILE_PATTERNS = *.cc \
*.hh \
*.hxx \
*.hcc
RECURSIVE = YES
-EXCLUDE = @top_srcdir@/milena/sandbox \
- @top_srcdir@/milena/trash \
- @top_srcdir@/milena/mln/core/concept/proxy.hxx \
- @top_srcdir@/milena/doc/examples/trash \
- @top_srcdir@/milena/doc/user-refman
- @top_srcdir@/milena/doc/devel-refman
- @top_srcdir@/milena/tests/unit_test
+EXCLUDE = @top_srcdir@/sandbox \
+ @top_srcdir@/trash \
+ @top_srcdir@/mln/core/concept/proxy.hxx \
+ @top_srcdir@/doc/examples/trash \
+ @top_srcdir@/doc/user-refman
+ @top_srcdir@/doc/devel-refman
+ @top_srcdir@/tests/unit_test
EXCLUDE_SYMLINKS = YES
EXCLUDE_PATTERNS = *spe.hh
EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*
-EXAMPLE_PATH = @top_srcdir@/milena/doc/examples \
- @top_srcdir@/milena/doc/outputs \
- @top_srcdir@/milena/doc/examples/split \
- @top_srcdir@/milena/doc/outputs/split
+EXAMPLE_PATH = @top_srcdir@/doc/examples \
+ @top_srcdir@/doc/outputs \
+ @top_srcdir@/doc/examples/split \
+ @top_srcdir@/doc/outputs/split
EXAMPLE_PATTERNS = *.cc \
*.cc.raw \
*.txt
EXAMPLE_RECURSIVE = NO
-IMAGE_PATH = @top_srcdir@/milena/doc/devel/figures \
- @top_srcdir@/milena/doc/img \
- @top_srcdir@/milena/doc/figures
+IMAGE_PATH = @top_srcdir@/doc/devel/figures \
+ @top_srcdir@/doc/img \
+ @top_srcdir@/doc/figures
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 273b3d8..e2c9acd 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -18,7 +18,7 @@
# Look for Milena headers in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
DOXYGEN = doxygen
@@ -215,7 +215,7 @@ edit = sed -e "s|@ID@|$$Id|" \
-e 's,@builddir\@,$(builddir),g'
$(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@
MAINTAINERCLEANFILES += $(DOXYFILE_USER)
@@ -292,7 +292,7 @@ edit_devel = sed \
$(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in
rm -f $@.tmp
- Id=`grep '^\$$Id' $(top_srcdir)/milena/ChangeLog \
+ Id=`grep '^\$$Id' $(top_srcdir)/ChangeLog \
| sed -e 's/\\\$$//g'`; \
$(edit) $< >$@.tmp
$(edit_devel) $@.tmp >$@
diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk
index 440d960..a1b7691 100755
--- a/milena/doc/gen-examples-outputs-mk
+++ b/milena/doc/gen-examples-outputs-mk
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# To be used from milena/doc/'s source directory.
+# To be used from doc/'s source directory.
me=`basename $0`
diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk
index b505370..9300192 100755
--- a/milena/doc/gen-split-examples-mk
+++ b/milena/doc/gen-split-examples-mk
@@ -16,7 +16,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# To be used from milena/doc/'s source directory.
+# To be used from doc/'s source directory.
# FIXME: Factor gen-split-examples-mk and gen-split-outputs-mk.
diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk
index 6a81b02..220cb3f 100644
--- a/milena/doc/programs-examples.mk
+++ b/milena/doc/programs-examples.mk
@@ -86,9 +86,9 @@ PROGRAMS_examples += \
tuto4_site_set_create
# FIXME: Careful, this will only work if this file is included by
-# `milena/doc/Makefile.am', since `examples/' is a subdirectory of
-# `milena/doc/'. Anyway, this file is to be eventually inlined in
-# `milena/doc/Makefile.am', so this is not a big deal.
+# `doc/Makefile.am', since `examples/' is a subdirectory of
+# `doc/'. Anyway, this file is to be eventually inlined in
+# `doc/Makefile.am', so this is not a big deal.
accu_right_instantiation_SOURCES = examples/accu-right-instantiation.cc
borderthickness_SOURCES = examples/borderthickness.cc
box2d_bbox_SOURCES = examples/box2d-bbox.cc
diff --git a/milena/doc/tools/data.hh.in b/milena/doc/tools/data.hh.in
index c300521..eccbbfa 100644
--- a/milena/doc/tools/data.hh.in
+++ b/milena/doc/tools/data.hh.in
@@ -32,6 +32,6 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the doc directory of Milena.
-# define MLN_DOC_DIR "@abs_top_srcdir@/milena/doc"
+# define MLN_DOC_DIR "@abs_top_srcdir@/doc"
#endif // ! DOC_TOOLS_HH
diff --git a/milena/doc/tutorial.tex b/milena/doc/tutorial.tex
index 5a61461..8d99520 100644
--- a/milena/doc/tutorial.tex
+++ b/milena/doc/tutorial.tex
@@ -138,12 +138,12 @@ It is a more detailed explanations of the library's features.
\textit{Assemblers} and \textit{designers} may be also interested by all the
examples provided with the documentation and the tutorial. The source code is
-available in \hpath{milena/doc/examples} \tofix{ref} and is usually pointed
+available in \hpath{doc/examples} \tofix{ref} and is usually pointed
out and commented by the documentation.
Taking a look at the test suite is also a good idea. The tests usually focus on
a single functionality and handle several use cases which may overlap your needs.
-The test suite is located in \hpath{milena/tests} \tofix{ref?}.
+The test suite is located in \hpath{tests} \tofix{ref?}.
Still not enough information? More information about all the routines is
available in the User HTML documentation \tofix{ref}.
@@ -338,12 +338,12 @@ List of \hpath{milena}'s subdirectories:
test suite. Feel free to use it in your programs.
\item \dir{mesh} --- A set of 3D meshes. They can be used with the full
- example located in \hpath{milena/apps}.
+ example located in \hpath{apps}.
\item \dir{mln} --- The core of the library. Contains all the library headers.
\item \dir{tests} --- The test suite. Is it subdivided in sub directories.
- The directory hierarchy respects \hpath{milena/mln}'s.
+ The directory hierarchy respects \hpath{mln}'s.
\item \dir{tools} --- Small tools written with milena. They can be used as examples.
@@ -405,8 +405,7 @@ List of \hpath{mln}'s subdirectories:
\end{itemize}
-The source code and the material of the documentation is available in \hpath{
-milena/doc}.
+The source code and the material of the documentation is available in \hpath{doc}.
List of \hpath{doc}'s subdirectories:
\begin{itemize}
\item \dir{examples} --- All the source code of the documentation examples.
@@ -723,7 +722,7 @@ compiled if you want to use them.
\doxysubsection{tuto2examples}{Examples}
Examples are part of the documentation. The sources are located in
-\hpath{milena/doc/examples}.
+\hpath{doc/examples}.
To compile the examples simply run:
\begin{verbatim}
@@ -822,7 +821,7 @@ implementation would look like this one:
\doxyrawcode{tuto3/fill_non_generic}
-See milena/doc/examples/tuto3/fill\_non\_generic.cc.
+See doc/examples/tuto3/fill\_non\_generic.cc.
In this example, there are a lot of \B{implicit} assumptions about the input:
@@ -1238,7 +1237,7 @@ This site only contains :
%**************************
\doxysection{tuto4images}{Images}
-In milena, an image is seen as a composition of both a site set and a function
+In Milena, an image is seen as a composition of both a site set and a function
mapping a site to a value.
%--------------------------
diff --git a/scribo/m4/autotroll.m4 b/milena/m4/autotroll.m4
similarity index 100%
copy from scribo/m4/autotroll.m4
copy to milena/m4/autotroll.m4
diff --git a/milena/m4/boost.m4 b/milena/m4/boost.m4
new file mode 120000
index 0000000..247b410
--- /dev/null
+++ b/milena/m4/boost.m4
@@ -0,0 +1 @@
+../../m4/boost.m4
\ No newline at end of file
diff --git a/scribo/m4/oln-with-lib.m4 b/milena/m4/oln-with-lib.m4
similarity index 100%
copy from scribo/m4/oln-with-lib.m4
copy to milena/m4/oln-with-lib.m4
diff --git a/scribo/m4/pkg.m4 b/milena/m4/pkg.m4
similarity index 100%
copy from scribo/m4/pkg.m4
copy to milena/m4/pkg.m4
diff --git a/milena/mesh/Makefile.am b/milena/mesh/Makefile.am
index eebfaab..c66b9f0 100644
--- a/milena/mesh/Makefile.am
+++ b/milena/mesh/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -49,9 +50,9 @@ dist_mesh_DATA += $(more_meshes)
## Pseudo-inverse curvature of meshes. ##
## ------------------------------------ ##
-mesh_pinv_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv
-mesh_pinv_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-pinv-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-pinv-curv && \
+mesh_pinv_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv
+mesh_pinv_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-pinv-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-pinv-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_pinv_curv
# FIXME: *-pinv-curv.off files should not be regenerated
@@ -67,9 +68,9 @@ dist_mesh_DATA += $(pinv_curv)
## Maximum curvature of meshes. ##
## ----------------------------- ##
-mesh_max_curv = $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv
-mesh_max_curv: $(top_srcdir)/milena/apps/mesh-segm-skel/mesh-max-curv.cc
- cd $(top_builddir)/milena/apps/mesh-segm-skel/mesh-max-curv && \
+mesh_max_curv = $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv
+mesh_max_curv: $(top_srcdir)/apps/mesh-segm-skel/mesh-max-curv.cc
+ cd $(top_builddir)/apps/mesh-segm-skel/mesh-max-curv && \
$(MAKE) $(AM_MAKEFLAGS) mesh_max_curv
# FIXME: *-max-curv.off files should not be regenerated
diff --git a/milena/tests/Makefile.am b/milena/tests/Makefile.am
index 83f946e..198b355 100644
--- a/milena/tests/Makefile.am
+++ b/milena/tests/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
accu \
@@ -88,7 +88,7 @@ TESTS = $(check_PROGRAMS)
EXTRA_DIST = tools/pretty_check.sh
.PHONY: pretty-check
pretty-check:
- $(top_srcdir)/milena/tests/tools/pretty_check.sh
+ $(top_srcdir)/tests/tools/pretty_check.sh
# Regen files recursively.
include $(top_srcdir)/build-aux/regen-recursive.mk
diff --git a/milena/tests/accu/Makefile.am b/milena/tests/accu/Makefile.am
index d494d46..201aba6 100644
--- a/milena/tests/accu/Makefile.am
+++ b/milena/tests/accu/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
image \
diff --git a/milena/tests/accu/image/Makefile.am b/milena/tests/accu/image/Makefile.am
index 141300f..a0cfb24 100644
--- a/milena/tests/accu/image/Makefile.am
+++ b/milena/tests/accu/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
init \
diff --git a/milena/tests/accu/math/Makefile.am b/milena/tests/accu/math/Makefile.am
index ca5358b..a9b0a0f 100644
--- a/milena/tests/accu/math/Makefile.am
+++ b/milena/tests/accu/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
count
diff --git a/milena/tests/accu/shape/Makefile.am b/milena/tests/accu/shape/Makefile.am
index 374ce89..7ad278d 100644
--- a/milena/tests/accu/shape/Makefile.am
+++ b/milena/tests/accu/shape/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox
diff --git a/milena/tests/accu/site_set/Makefile.am b/milena/tests/accu/site_set/Makefile.am
index a44676e..12386d0 100644
--- a/milena/tests/accu/site_set/Makefile.am
+++ b/milena/tests/accu/site_set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
rectangularity
diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am
index c331db0..f945239 100644
--- a/milena/tests/accu/stat/Makefile.am
+++ b/milena/tests/accu/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
var \
diff --git a/milena/tests/algebra/Makefile.am b/milena/tests/algebra/Makefile.am
index 471389e..b441e4a 100644
--- a/milena/tests/algebra/Makefile.am
+++ b/milena/tests/algebra/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
h_mat \
diff --git a/milena/tests/arith/Makefile.am b/milena/tests/arith/Makefile.am
index 89dfc9e..5bd2aae 100644
--- a/milena/tests/arith/Makefile.am
+++ b/milena/tests/arith/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff_abs \
diff --git a/milena/tests/binarization/Makefile.am b/milena/tests/binarization/Makefile.am
index 601d163..c299519 100644
--- a/milena/tests/binarization/Makefile.am
+++ b/milena/tests/binarization/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Copyright (C) 2008, 2009, 2010, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
threshold
diff --git a/milena/tests/border/Makefile.am b/milena/tests/border/Makefile.am
index 80241ad..b9f1a7b 100644
--- a/milena/tests/border/Makefile.am
+++ b/milena/tests/border/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
adjust \
diff --git a/milena/tests/canvas/Makefile.am b/milena/tests/canvas/Makefile.am
index d8db016..f98d236 100644
--- a/milena/tests/canvas/Makefile.am
+++ b/milena/tests/canvas/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = browsing morpho
diff --git a/milena/tests/canvas/browsing/Makefile.am b/milena/tests/canvas/browsing/Makefile.am
index 66b5b44..2b53f13 100644
--- a/milena/tests/canvas/browsing/Makefile.am
+++ b/milena/tests/canvas/browsing/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fwd \
diff --git a/milena/tests/canvas/morpho/Makefile.am b/milena/tests/canvas/morpho/Makefile.am
index 0504c8e..ef1e9b1 100644
--- a/milena/tests/canvas/morpho/Makefile.am
+++ b/milena/tests/canvas/morpho/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS=attribute_filter
diff --git a/milena/tests/convert/Makefile.am b/milena/tests/convert/Makefile.am
index e4e3545..66ec621 100644
--- a/milena/tests/convert/Makefile.am
+++ b/milena/tests/convert/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
include $(top_srcdir)/build-aux/autotroll.mk
SUBDIRS = impl
diff --git a/milena/tests/convert/impl/Makefile.am b/milena/tests/convert/impl/Makefile.am
index a7cb10c..8c4c532 100644
--- a/milena/tests/convert/impl/Makefile.am
+++ b/milena/tests/convert/impl/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
from_site_set_to_image
diff --git a/milena/tests/core/Makefile.am b/milena/tests/core/Makefile.am
index ba4b041..b942219 100644
--- a/milena/tests/core/Makefile.am
+++ b/milena/tests/core/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
alias \
diff --git a/milena/tests/core/alias/Makefile.am b/milena/tests/core/alias/Makefile.am
index 9c47da2..51c16fd 100644
--- a/milena/tests/core/alias/Makefile.am
+++ b/milena/tests/core/alias/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box1d \
diff --git a/milena/tests/core/image/Makefile.am b/milena/tests/core/image/Makefile.am
index 5ac8889..d3bfb4a 100644
--- a/milena/tests/core/image/Makefile.am
+++ b/milena/tests/core/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
# (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dmorph \
diff --git a/milena/tests/core/image/dmorph/Makefile.am b/milena/tests/core/image/dmorph/Makefile.am
index 3faee32..0d0240f 100644
--- a/milena/tests/core/image/dmorph/Makefile.am
+++ b/milena/tests/core/image/dmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
hexa \
diff --git a/milena/tests/core/image/imorph/Makefile.am b/milena/tests/core/image/imorph/Makefile.am
index b019f1c..2d986ca 100644
--- a/milena/tests/core/image/imorph/Makefile.am
+++ b/milena/tests/core/image/imorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
decorated_image \
diff --git a/milena/tests/core/image/vmorph/Makefile.am b/milena/tests/core/image/vmorph/Makefile.am
index 5f7eb98..ef55c8a 100644
--- a/milena/tests/core/image/vmorph/Makefile.am
+++ b/milena/tests/core/image/vmorph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
cast_image \
diff --git a/milena/tests/core/other/Makefile.am b/milena/tests/core/other/Makefile.am
index 85ce865..c435eed 100644
--- a/milena/tests/core/other/Makefile.am
+++ b/milena/tests/core/other/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box_runstart_piter \
diff --git a/milena/tests/core/routine/Makefile.am b/milena/tests/core/routine/Makefile.am
index 2640c47..07af185 100644
--- a/milena/tests/core/routine/Makefile.am
+++ b/milena/tests/core/routine/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
duplicate \
diff --git a/milena/tests/core/site_set/Makefile.am b/milena/tests/core/site_set/Makefile.am
index e092e73..5a29e5f 100644
--- a/milena/tests/core/site_set/Makefile.am
+++ b/milena/tests/core/site_set/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
box \
diff --git a/milena/tests/data.hh.in b/milena/tests/data.hh.in
index 1953989..ae6f446 100644
--- a/milena/tests/data.hh.in
+++ b/milena/tests/data.hh.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory
+// Copyright (C) 2008, 2009, 2010 EPITA Research and Development Laboratory
// (LRDE)
//
// This file is part of Olena.
@@ -33,12 +33,12 @@
(as well as additional burden in Makefiles, too.). */
/// The absolute path to the img directory of Milena.
-# define MLN_IMG_DIR "@abs_top_srcdir@/milena/img"
+# define MLN_IMG_DIR "@abs_top_srcdir@/img"
/// The absolute path to the img directory of Milena.
-# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/milena/tests/img"
+# define MLN_TESTS_IMG_DIR "@abs_top_srcdir@/tests/img"
/// The absolute path to the mesh directory of Milena.
-# define MLN_MESH_DIR "@abs_top_srcdir@/milena/mesh"
+# define MLN_MESH_DIR "@abs_top_srcdir@/mesh"
#endif // ! TESTS_DATA_HH
diff --git a/milena/tests/data/Makefile.am b/milena/tests/data/Makefile.am
index 205337e..e24b8c9 100644
--- a/milena/tests/data/Makefile.am
+++ b/milena/tests/data/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = approx naive
diff --git a/milena/tests/data/approx/Makefile.am b/milena/tests/data/approx/Makefile.am
index 6f94721..bebdee0 100644
--- a/milena/tests/data/approx/Makefile.am
+++ b/milena/tests/data/approx/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/data/naive/Makefile.am b/milena/tests/data/naive/Makefile.am
index d42bcc6..74787ea 100644
--- a/milena/tests/data/naive/Makefile.am
+++ b/milena/tests/data/naive/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
median
diff --git a/milena/tests/debug/Makefile.am b/milena/tests/debug/Makefile.am
index 0346f1a..f6b51c1 100644
--- a/milena/tests/debug/Makefile.am
+++ b/milena/tests/debug/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
println \
diff --git a/milena/tests/display/Makefile.am b/milena/tests/display/Makefile.am
index bdd6d0f..e8d2789 100644
--- a/milena/tests/display/Makefile.am
+++ b/milena/tests/display/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
# Remember not to execute display tests by default. They require a
# running X11 server (as well as a `pkill' binary...). Perform the
diff --git a/milena/tests/draw/Makefile.am b/milena/tests/draw/Makefile.am
index c823cfb..3a1b771 100644
--- a/milena/tests/draw/Makefile.am
+++ b/milena/tests/draw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
line \
diff --git a/milena/tests/estim/Makefile.am b/milena/tests/estim/Makefile.am
index 2490ef9..6d422b5 100644
--- a/milena/tests/estim/Makefile.am
+++ b/milena/tests/estim/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mean \
diff --git a/milena/tests/extension/Makefile.am b/milena/tests/extension/Makefile.am
index 85f9835..aca0fe2 100644
--- a/milena/tests/extension/Makefile.am
+++ b/milena/tests/extension/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fill
diff --git a/milena/tests/extract/Makefile.am b/milena/tests/extract/Makefile.am
index 2168f8d..7c7f98e 100644
--- a/milena/tests/extract/Makefile.am
+++ b/milena/tests/extract/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/fun/Makefile.am b/milena/tests/fun/Makefile.am
index 82d6e89..a7776ba 100644
--- a/milena/tests/fun/Makefile.am
+++ b/milena/tests/fun/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
i2v \
diff --git a/milena/tests/fun/i2v/Makefile.am b/milena/tests/fun/i2v/Makefile.am
index a3de8f9..74b140d 100644
--- a/milena/tests/fun/i2v/Makefile.am
+++ b/milena/tests/fun/i2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
all_to \
diff --git a/milena/tests/fun/p2b/Makefile.am b/milena/tests/fun/p2b/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2b/Makefile.am
+++ b/milena/tests/fun/p2b/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/p2p/Makefile.am b/milena/tests/fun/p2p/Makefile.am
index 862c78b..bd381a1 100644
--- a/milena/tests/fun/p2p/Makefile.am
+++ b/milena/tests/fun/p2p/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fold \
diff --git a/milena/tests/fun/p2v/Makefile.am b/milena/tests/fun/p2v/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/fun/p2v/Makefile.am
+++ b/milena/tests/fun/p2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/fun/stat/Makefile.am b/milena/tests/fun/stat/Makefile.am
index aac5327..c4c8720 100644
--- a/milena/tests/fun/stat/Makefile.am
+++ b/milena/tests/fun/stat/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
mahalanobis
diff --git a/milena/tests/fun/v2i/Makefile.am b/milena/tests/fun/v2i/Makefile.am
index e67e7d0..a1812c7 100644
--- a/milena/tests/fun/v2i/Makefile.am
+++ b/milena/tests/fun/v2i/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
index_of_value
diff --git a/milena/tests/fun/v2v/Makefile.am b/milena/tests/fun/v2v/Makefile.am
index ad0f173..343626a 100644
--- a/milena/tests/fun/v2v/Makefile.am
+++ b/milena/tests/fun/v2v/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
norm \
diff --git a/milena/tests/fun/vv2v/Makefile.am b/milena/tests/fun/vv2v/Makefile.am
index d180e3d..4d5a09b 100644
--- a/milena/tests/fun/vv2v/Makefile.am
+++ b/milena/tests/fun/vv2v/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
max \
diff --git a/milena/tests/fun/x2x/Makefile.am b/milena/tests/fun/x2x/Makefile.am
index 6ac5c22..27e7f20 100644
--- a/milena/tests/fun/x2x/Makefile.am
+++ b/milena/tests/fun/x2x/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
composed \
diff --git a/milena/tests/geom/Makefile.am b/milena/tests/geom/Makefile.am
index 670561b..d19f37a 100644
--- a/milena/tests/geom/Makefile.am
+++ b/milena/tests/geom/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bbox \
diff --git a/milena/tests/graph/Makefile.am b/milena/tests/graph/Makefile.am
index 608b6d9..aa534e8 100644
--- a/milena/tests/graph/Makefile.am
+++ b/milena/tests/graph/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = attribute
diff --git a/milena/tests/graph/attribute/Makefile.am b/milena/tests/graph/attribute/Makefile.am
index cb07318..22b353a 100644
--- a/milena/tests/graph/attribute/Makefile.am
+++ b/milena/tests/graph/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/histo/Makefile.am b/milena/tests/histo/Makefile.am
index b5f7e7e..62d8fde 100644
--- a/milena/tests/histo/Makefile.am
+++ b/milena/tests/histo/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute \
diff --git a/milena/tests/io/Makefile.am b/milena/tests/io/Makefile.am
index bd6c0a4..6dd7ed3 100644
--- a/milena/tests/io/Makefile.am
+++ b/milena/tests/io/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
## ---------------------- ##
## Built-in I/O support. ##
diff --git a/milena/tests/io/dicom/Makefile.am b/milena/tests/io/dicom/Makefile.am
index d8a4ea8..d06e2ce 100644
--- a/milena/tests/io/dicom/Makefile.am
+++ b/milena/tests/io/dicom/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = dicom
diff --git a/milena/tests/io/dump/Makefile.am b/milena/tests/io/dump/Makefile.am
index dedd818..1c88fcb 100644
--- a/milena/tests/io/dump/Makefile.am
+++ b/milena/tests/io/dump/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dump
diff --git a/milena/tests/io/fits/Makefile.am b/milena/tests/io/fits/Makefile.am
index f692f35..614c40e 100644
--- a/milena/tests/io/fits/Makefile.am
+++ b/milena/tests/io/fits/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(CFITSIO_CPPFLAGS)
AM_LDFLAGS = $(CFITSIO_LDFLAGS)
diff --git a/milena/tests/io/fld/Makefile.am b/milena/tests/io/fld/Makefile.am
index 7cbe50b..58dbbcc 100644
--- a/milena/tests/io/fld/Makefile.am
+++ b/milena/tests/io/fld/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
fld2d \
diff --git a/milena/tests/io/magick/Makefile.am b/milena/tests/io/magick/Makefile.am
index c04147f..5414ddb 100644
--- a/milena/tests/io/magick/Makefile.am
+++ b/milena/tests/io/magick/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(MAGICKXX_CPPFLAGS)
AM_LDFLAGS = $(MAGICKXX_LDFLAGS)
diff --git a/milena/tests/io/off/Makefile.am b/milena/tests/io/off/Makefile.am
index 4029729..5d1f07b 100644
--- a/milena/tests/io/off/Makefile.am
+++ b/milena/tests/io/off/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load_bin \
diff --git a/milena/tests/io/pbm/Makefile.am b/milena/tests/io/pbm/Makefile.am
index 690c895..488e240 100644
--- a/milena/tests/io/pbm/Makefile.am
+++ b/milena/tests/io/pbm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pbm \
diff --git a/milena/tests/io/pbms/Makefile.am b/milena/tests/io/pbms/Makefile.am
index f6d9770..459964d 100644
--- a/milena/tests/io/pbms/Makefile.am
+++ b/milena/tests/io/pbms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pfm/Makefile.am b/milena/tests/io/pfm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pfm/Makefile.am
+++ b/milena/tests/io/pfm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/pgm/Makefile.am b/milena/tests/io/pgm/Makefile.am
index 8fdc560..fd505ee 100644
--- a/milena/tests/io/pgm/Makefile.am
+++ b/milena/tests/io/pgm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pgm16 \
diff --git a/milena/tests/io/pgms/Makefile.am b/milena/tests/io/pgms/Makefile.am
index c5ac784..7a8fb2e 100644
--- a/milena/tests/io/pgms/Makefile.am
+++ b/milena/tests/io/pgms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/pnm/Makefile.am b/milena/tests/io/pnm/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/io/pnm/Makefile.am
+++ b/milena/tests/io/pnm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/io/ppm/Makefile.am b/milena/tests/io/ppm/Makefile.am
index 695e5d7..61cda9c 100644
--- a/milena/tests/io/ppm/Makefile.am
+++ b/milena/tests/io/ppm/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
ppm16 \
diff --git a/milena/tests/io/ppms/Makefile.am b/milena/tests/io/ppms/Makefile.am
index b11b52b..ffabb4b 100644
--- a/milena/tests/io/ppms/Makefile.am
+++ b/milena/tests/io/ppms/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
load
diff --git a/milena/tests/io/tiff/Makefile.am b/milena/tests/io/tiff/Makefile.am
index 356214b..57f3edc 100644
--- a/milena/tests/io/tiff/Makefile.am
+++ b/milena/tests/io/tiff/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
AM_CPPFLAGS += $(TIFF_CPPFLAGS)
AM_LDFLAGS = $(TIFF_LDFLAGS)
diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am
index c272da4..0251353 100644
--- a/milena/tests/labeling/Makefile.am
+++ b/milena/tests/labeling/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
background \
diff --git a/milena/tests/linear/Makefile.am b/milena/tests/linear/Makefile.am
index 8842b8d..25acf9c 100644
--- a/milena/tests/linear/Makefile.am
+++ b/milena/tests/linear/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
local
diff --git a/milena/tests/linear/gaussian/Makefile.am b/milena/tests/linear/gaussian/Makefile.am
index 952a711..c70892c 100644
--- a/milena/tests/linear/gaussian/Makefile.am
+++ b/milena/tests/linear/gaussian/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet).
diff --git a/milena/tests/linear/local/Makefile.am b/milena/tests/linear/local/Makefile.am
index 9f53cfb..04b4f69 100644
--- a/milena/tests/linear/local/Makefile.am
+++ b/milena/tests/linear/local/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
convolve
diff --git a/milena/tests/literal/Makefile.am b/milena/tests/literal/Makefile.am
index ef86851..658c4c9 100644
--- a/milena/tests/literal/Makefile.am
+++ b/milena/tests/literal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
black \
diff --git a/milena/tests/logical/Makefile.am b/milena/tests/logical/Makefile.am
index ca59622..8661090 100644
--- a/milena/tests/logical/Makefile.am
+++ b/milena/tests/logical/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
and \
diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am
index 34e0eff..12465e3 100644
--- a/milena/tests/make/Makefile.am
+++ b/milena/tests/make/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dual_neighb \
diff --git a/milena/tests/math/Makefile.am b/milena/tests/math/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/math/Makefile.am
+++ b/milena/tests/math/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/Makefile.am b/milena/tests/metal/Makefile.am
index bc24893..93c0358 100644
--- a/milena/tests/metal/Makefile.am
+++ b/milena/tests/metal/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = make math
diff --git a/milena/tests/metal/make/Makefile.am b/milena/tests/metal/make/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/metal/make/Makefile.am
+++ b/milena/tests/metal/make/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/metal/math/Makefile.am b/milena/tests/metal/math/Makefile.am
index cc48940..9a7762e 100644
--- a/milena/tests/metal/math/Makefile.am
+++ b/milena/tests/metal/math/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
pow \
diff --git a/milena/tests/morpho/Makefile.am b/milena/tests/morpho/Makefile.am
index a2e460e..cae082a 100644
--- a/milena/tests/morpho/Makefile.am
+++ b/milena/tests/morpho/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx \
diff --git a/milena/tests/morpho/approx/Makefile.am b/milena/tests/morpho/approx/Makefile.am
index fcc347e..1a44c1a 100644
--- a/milena/tests/morpho/approx/Makefile.am
+++ b/milena/tests/morpho/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
dilation \
diff --git a/milena/tests/morpho/attribute/Makefile.am b/milena/tests/morpho/attribute/Makefile.am
index ae0a5e5..11ad352 100644
--- a/milena/tests/morpho/attribute/Makefile.am
+++ b/milena/tests/morpho/attribute/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/morpho/closing/Makefile.am b/milena/tests/morpho/closing/Makefile.am
index 8502e59..3806130 100644
--- a/milena/tests/morpho/closing/Makefile.am
+++ b/milena/tests/morpho/closing/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/closing/approx/Makefile.am
+++ b/milena/tests/morpho/closing/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/elementary/Makefile.am b/milena/tests/morpho/elementary/Makefile.am
index 37a726a..dc047eb 100644
--- a/milena/tests/morpho/elementary/Makefile.am
+++ b/milena/tests/morpho/elementary/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
laplacian \
diff --git a/milena/tests/morpho/opening/Makefile.am b/milena/tests/morpho/opening/Makefile.am
index 4c06dc4..519353a 100644
--- a/milena/tests/morpho/opening/Makefile.am
+++ b/milena/tests/morpho/opening/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
approx
diff --git a/milena/tests/morpho/opening/approx/Makefile.am b/milena/tests/morpho/opening/approx/Makefile.am
index 101bbe5..b0e4de5 100644
--- a/milena/tests/morpho/opening/approx/Makefile.am
+++ b/milena/tests/morpho/opening/approx/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
structural
diff --git a/milena/tests/morpho/reconstruction/Makefile.am b/milena/tests/morpho/reconstruction/Makefile.am
index 4ea328e..cae02a5 100644
--- a/milena/tests/morpho/reconstruction/Makefile.am
+++ b/milena/tests/morpho/reconstruction/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
by_dilation \
diff --git a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_dilation/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
index 48f1460..1bf1f7d 100644
--- a/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
+++ b/milena/tests/morpho/reconstruction/by_erosion/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/morpho/tree/Makefile.am b/milena/tests/morpho/tree/Makefile.am
index 303bd7c..7721536 100644
--- a/milena/tests/morpho/tree/Makefile.am
+++ b/milena/tests/morpho/tree/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
compute_attribute_image \
diff --git a/milena/tests/morpho/tree/filter/Makefile.am b/milena/tests/morpho/tree/filter/Makefile.am
index 41a0603..65079aa 100644
--- a/milena/tests/morpho/tree/filter/Makefile.am
+++ b/milena/tests/morpho/tree/filter/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
filter
diff --git a/milena/tests/morpho/watershed/Makefile.am b/milena/tests/morpho/watershed/Makefile.am
index 01a28bc..0237863 100644
--- a/milena/tests/morpho/watershed/Makefile.am
+++ b/milena/tests/morpho/watershed/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
flooding \
diff --git a/milena/tests/norm/Makefile.am b/milena/tests/norm/Makefile.am
index 4c335be..2316660 100644
--- a/milena/tests/norm/Makefile.am
+++ b/milena/tests/norm/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
l1 \
diff --git a/milena/tests/opt/Makefile.am b/milena/tests/opt/Makefile.am
index 27f0f0d..5b3e806 100644
--- a/milena/tests/opt/Makefile.am
+++ b/milena/tests/opt/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
at
diff --git a/milena/tests/pw/Makefile.am b/milena/tests/pw/Makefile.am
index ae5a829..422b847 100644
--- a/milena/tests/pw/Makefile.am
+++ b/milena/tests/pw/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
image \
diff --git a/milena/tests/registration/Makefile.am b/milena/tests/registration/Makefile.am
index 2910259..358e7a3 100644
--- a/milena/tests/registration/Makefile.am
+++ b/milena/tests/registration/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
#<<lrde
# FIXME: Not distributed (yet) and currently disabled.
diff --git a/milena/tests/set/Makefile.am b/milena/tests/set/Makefile.am
index ab6e345..7ac5d69 100644
--- a/milena/tests/set/Makefile.am
+++ b/milena/tests/set/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
card \
diff --git a/milena/tests/subsampling/Makefile.am b/milena/tests/subsampling/Makefile.am
index 7e859b4..6264bfb 100644
--- a/milena/tests/subsampling/Makefile.am
+++ b/milena/tests/subsampling/Makefile.am
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/tag/Makefile.am b/milena/tests/tag/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/tag/Makefile.am
+++ b/milena/tests/tag/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/test/Makefile.am b/milena/tests/test/Makefile.am
index 6e42c2c..4242e4f 100644
--- a/milena/tests/test/Makefile.am
+++ b/milena/tests/test/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
positive
diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk
index 85ee5d5..da51f6b 100644
--- a/milena/tests/tests.mk
+++ b/milena/tests/tests.mk
@@ -2,7 +2,7 @@
## Shared configuration for tests.
-## Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
## Laboratory (LRDE)
##
## This file is part of Olena.
@@ -20,11 +20,11 @@
## along with Olena. If not, see <http://www.gnu.org/licenses/>.
-# FIXME: Revamp (see Olena 0.11's test suite).
+# FIXME: Revamp? (See Olena 0.11's test suite).
# Look for Milena header in srcdir and for (generated) test headers
# (like data.hh) in builddir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
# FIXME: Add
#
@@ -55,4 +55,4 @@ TIFF_LDFLAGS = @TIFF_LDFLAGS@
# Inject rules to compile tests (recursively), without running them.
-include $(top_srcdir)/milena/tests/tests-recursive.mk
+include $(top_srcdir)/tests/tests-recursive.mk
diff --git a/milena/tests/topo/Makefile.am b/milena/tests/topo/Makefile.am
index b8684bf..e22f880 100644
--- a/milena/tests/topo/Makefile.am
+++ b/milena/tests/topo/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = skeleton
diff --git a/milena/tests/topo/skeleton/Makefile.am b/milena/tests/topo/skeleton/Makefile.am
index 0e60ff6..78b35d9 100644
--- a/milena/tests/topo/skeleton/Makefile.am
+++ b/milena/tests/topo/skeleton/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
crest \
diff --git a/milena/tests/trace/Makefile.am b/milena/tests/trace/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/trace/Makefile.am
+++ b/milena/tests/trace/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/trait/Makefile.am b/milena/tests/trait/Makefile.am
index f3411f9..bdd172c 100644
--- a/milena/tests/trait/Makefile.am
+++ b/milena/tests/trait/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = image op value
diff --git a/milena/tests/trait/image/Makefile.am b/milena/tests/trait/image/Makefile.am
index a428a33..8eda761 100644
--- a/milena/tests/trait/image/Makefile.am
+++ b/milena/tests/trait/image/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
images
diff --git a/milena/tests/trait/op/Makefile.am b/milena/tests/trait/op/Makefile.am
index 8d83dd2..ca048a3 100644
--- a/milena/tests/trait/op/Makefile.am
+++ b/milena/tests/trait/op/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
plus \
diff --git a/milena/tests/trait/value/Makefile.am b/milena/tests/trait/value/Makefile.am
index 30e6d67..2c653cd 100644
--- a/milena/tests/trait/value/Makefile.am
+++ b/milena/tests/trait/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
comp \
diff --git a/milena/tests/transform/Makefile.am b/milena/tests/transform/Makefile.am
index 933483d..569f5b0 100644
--- a/milena/tests/transform/Makefile.am
+++ b/milena/tests/transform/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
bench_closest_point_geodesic \
diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am
index 4ee9885..b324796 100644
--- a/milena/tests/unit_test/Makefile.am
+++ b/milena/tests/unit_test/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
COND_TESTS = cond_tests_boost-tuple \
cond_tests_cfitsio \
@@ -42,7 +42,7 @@ regen-am:
# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@
#
# `$(abs_top_srcdir)' is required because of the change of directory
-# at the beginning og the action.
+# at the beginning of the action.
$(srcdir)/unit-tests.mk: $(top_srcdir)/build-aux/build_unit_test.sh disabled_tests $(COND_TESTS)
cd $(top_srcdir) \
&& ./build-aux/build_unit_test.sh \
diff --git a/milena/tests/upscaling/Makefile.am b/milena/tests/upscaling/Makefile.am
index 3d0016f..f0c34e2 100644
--- a/milena/tests/upscaling/Makefile.am
+++ b/milena/tests/upscaling/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
art
diff --git a/milena/tests/upscaling/art/Makefile.am b/milena/tests/upscaling/art/Makefile.am
index 01900f4..5f10400 100644
--- a/milena/tests/upscaling/art/Makefile.am
+++ b/milena/tests/upscaling/art/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/util/Makefile.am b/milena/tests/util/Makefile.am
index 0a1119e..bb9b681 100644
--- a/milena/tests/util/Makefile.am
+++ b/milena/tests/util/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
diff --git a/milena/tests/value/Makefile.am b/milena/tests/value/Makefile.am
index 975d471..d932933 100644
--- a/milena/tests/value/Makefile.am
+++ b/milena/tests/value/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
builtin \
diff --git a/milena/tests/value/builtin/Makefile.am b/milena/tests/value/builtin/Makefile.am
index 31ac350..2150e61 100644
--- a/milena/tests/value/builtin/Makefile.am
+++ b/milena/tests/value/builtin/Makefile.am
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
builtin \
diff --git a/milena/tests/value/concept/Makefile.am b/milena/tests/value/concept/Makefile.am
index 4c3ccb4..cdb6b15 100644
--- a/milena/tests/value/concept/Makefile.am
+++ b/milena/tests/value/concept/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2007, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2007, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,4 +15,4 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
diff --git a/milena/tests/win/Makefile.am b/milena/tests/win/Makefile.am
index 9c58718..39314f8 100644
--- a/milena/tests/win/Makefile.am
+++ b/milena/tests/win/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 EPITA Research and Development
+# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development
# Laboratory (LRDE).
#
# This file is part of Olena.
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
backdiag2d \
diff --git a/milena/tests/world/Makefile.am b/milena/tests/world/Makefile.am
index 3bae089..9634ec5 100644
--- a/milena/tests/world/Makefile.am
+++ b/milena/tests/world/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
binary_2d \
diff --git a/milena/tests/world/binary_2d/Makefile.am b/milena/tests/world/binary_2d/Makefile.am
index a52757c..25fd269 100644
--- a/milena/tests/world/binary_2d/Makefile.am
+++ b/milena/tests/world/binary_2d/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
enlarge
diff --git a/milena/tests/world/inter_pixel/Makefile.am b/milena/tests/world/inter_pixel/Makefile.am
index 2d08ba2..8f1386e 100644
--- a/milena/tests/world/inter_pixel/Makefile.am
+++ b/milena/tests/world/inter_pixel/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
SUBDIRS = \
dim2
diff --git a/milena/tests/world/inter_pixel/dim2/Makefile.am b/milena/tests/world/inter_pixel/dim2/Makefile.am
index 10ac0fb..6404f7a 100644
--- a/milena/tests/world/inter_pixel/dim2/Makefile.am
+++ b/milena/tests/world/inter_pixel/dim2/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tests/tests.mk
+include $(top_srcdir)/tests/tests.mk
check_PROGRAMS = \
make_edge_image
diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am
index f7114d0..2f7b3dd 100644
--- a/milena/tools/Makefile.am
+++ b/milena/tools/Makefile.am
@@ -1,4 +1,5 @@
-# Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE).
+# Copyright (C) 2008, 2009, 2010 EPITA Research and Development
+# Laboratory (LRDE).
#
# This file is part of Olena.
#
@@ -14,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>.
-include $(top_srcdir)/milena/tools/tools.mk
+include $(top_srcdir)/tools/tools.mk
bin_PROGRAMS = \
seed2tiling \
diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk
index 9d9a046..97a8082 100644
--- a/milena/tools/tools.mk
+++ b/milena/tools/tools.mk
@@ -18,7 +18,7 @@
## FIXME: Revamp (see Olena 0.11's test suite).
# Look for Milena header in srcdir.
-AM_CPPFLAGS = -I$(top_srcdir)/milena
+AM_CPPFLAGS = -I$(top_srcdir)
# FIXME: Add
#
--
1.5.6.5
13 years, 6 months
- 1
- 0