- Olena-patches

[PATCH 15/31] Use more canonical names to handle the configuration of Swilena.
by Roland Levillain 15 May '09

15 May '09

* configure.ac: s/with_swilena/enable_swilena/. (ENABLE_SWILENA): Adjust conditional. --- ChangeLog | 7 +++++++ configure.ac | 6 ++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d64a04d..494377a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Use more canonical names to handle the configuration of Swilena. + + * configure.ac: s/with_swilena/enable_swilena/. + (ENABLE_SWILENA): Adjust conditional. + +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Make Milena tools (milena/tools/) optional. * configure.ac: Add option `--enable-tools'. diff --git a/configure.ac b/configure.ac index 7b0aacb..48a849c 100644 --- a/configure.ac +++ b/configure.ac @@ -130,11 +130,9 @@ AC_CONFIG_SUBDIRS([external/trimesh]) ## Swilena. ## ## --------- ## -OLN_WITH_SWILENA([with_swilena=yes], [with_swilena=no]) -AM_CONDITIONAL([ENABLE_SWILENA], [test x$with_swilena = xyes]) +OLN_WITH_SWILENA([enable_swilena=yes], []) +AM_CONDITIONAL([ENABLE_SWILENA], [test x$enable_swilena = xyes]) -# FIXME: Should we still configure these files if ENABLE_SWILENA is -# false? AC_CONFIG_FILES([swilena/Makefile swilena/python/Makefile]) -- 1.6.1.2

1 0

[PATCH 14/31] Make Milena tools (milena/tools/) optional.
by Roland Levillain 15 May '09

15 May '09

* configure.ac: Add option `--enable-tools'. (ENABLE_TOOLS): New conditional. Gather lines related to tools. * milena/Makefile.am (SUBDIRS) [ENABLE_TOOLS]: Add tools. --- ChangeLog | 9 +++++++++ configure.ac | 30 ++++++++++++++++++++---------- milena/Makefile.am | 4 ++++ 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ff0d142..d64a04d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,14 @@ 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Make Milena tools (milena/tools/) optional. + + * configure.ac: Add option `--enable-tools'. + (ENABLE_TOOLS): New conditional. + Gather lines related to tools. + * milena/Makefile.am (SUBDIRS) [ENABLE_TOOLS]: Add tools. + +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Make Milena applications (milena/apps/) optional. * configure.ac: Add option `--enable-apps'. diff --git a/configure.ac b/configure.ac index 5cb3f06..7b0aacb 100644 --- a/configure.ac +++ b/configure.ac @@ -87,15 +87,7 @@ if test "$GXX" = yes && test -z "$TESTS_CXXFLAGS_DEBUG"; then TESTS_CXXFLAGS_DEBUG="-O0 -ggdb -Wall -W -D_GLIBCXX_DEBUG -D_GLIBCXX_CONCEPT_CHECKS" fi -# ----------------- # -# Flags for tools. # -# ----------------- # -AC_ARG_VAR([TOOLS_CXXFLAGS]) -# We want fast binaries for tools. -if test "$GXX" = yes && test -z "$TOOLS_CXXFLAGS"; then - TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W" -fi ## ------------------ ## @@ -176,10 +168,8 @@ AC_CONFIG_FILES([ milena/doc/tutorial/Makefile milena/doc/white_paper/Makefile milena/mesh/Makefile - milena/tools/Makefile ]) - ## ------- ## ## Tests. ## ## ------- ## @@ -333,4 +323,24 @@ if test "$GXX" = yes && test -z "$APPS_CXXFLAGS"; then APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W" 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]) +# We want fast binaries for tools. +if test "$GXX" = yes && test -z "$TOOLS_CXXFLAGS"; then + TOOLS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W" +fi + + AC_OUTPUT diff --git a/milena/Makefile.am b/milena/Makefile.am index e267598..a854381 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -9,6 +9,10 @@ if ENABLE_APPS SUBDIRS += apps endif ENABLE_APPS +if ENABLE_TOOLS + SUBDIRS += tools +endif ENABLE_TOOLS + .PHONY: doc tutorial tools doc: -- 1.6.1.2

1 0

[PATCH 13/31] Make Milena applications (milena/apps/) optional.
by Roland Levillain 15 May '09

15 May '09

* configure.ac: Add option `--enable-apps'. (ENABLE_APPS): New conditional. Always configure milena/apps/Makefile and milena/apps/statues/Makefile. Populate APPS_CXXFLAGS with default flags. * milena/Makefile.am (SUBDIRS) [ENABLE_APPS]: Add apps. --- ChangeLog | 11 +++++++++++ configure.ac | 23 ++++++++++++++++------- milena/Makefile.am | 6 ++++-- 3 files changed, 31 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f7ea4c..ff0d142 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Make Milena applications (milena/apps/) optional. + + * configure.ac: Add option `--enable-apps'. + (ENABLE_APPS): New conditional. + Always configure milena/apps/Makefile and + milena/apps/statues/Makefile. + Populate APPS_CXXFLAGS with default flags. + * milena/Makefile.am (SUBDIRS) [ENABLE_APPS]: Add apps. + +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Improve configure.ac w.r.t. Trimesh. * m4/trimesh.m4: Remove, and move relevant lines... diff --git a/configure.ac b/configure.ac index 6b46bc8..5cb3f06 100644 --- a/configure.ac +++ b/configure.ac @@ -298,14 +298,16 @@ AC_CONFIG_FILES([ ## Applications. ## ## -------------- ## -# FIXME: Don't build applications depending on Trimesh if Trimesh is not built. +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. -# FIXME: Should it be achieved through oln.m4 macros, as we did in Olena 0.11? -# FIXME: ENABLE IT -#AC_CONFIG_FILES([ -# milena/apps/Makefile -# milena/apps/statues/Makefile -#]) +AC_CONFIG_FILES([ + milena/apps/Makefile + milena/apps/statues/Makefile +]) # Configure tests. # FIXME: Consider using `sed' instead of `configure' to create these @@ -324,4 +326,11 @@ AC_CONFIG_FILES([milena/apps/statues/test-mesh-complex-max-curv-segm], AC_CONFIG_FILES([milena/apps/statues/test-mesh-complex-skel], [chmod +x milena/apps/statues/test-mesh-complex-skel]) +# Flags for apps. +AC_ARG_VAR([APPS_CXXFLAGS]) +# We want fast binaries for apps. +if test "$GXX" = yes && test -z "$APPS_CXXFLAGS"; then + APPS_CXXFLAGS="-O3 -DNDEBUG -ggdb -Wall -W" +fi + AC_OUTPUT diff --git a/milena/Makefile.am b/milena/Makefile.am index 8ff2f4f..e267598 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,11 +1,13 @@ ## Process this file through Automake to create Makefile.in. -##FIXME SUBDIRS = \ doc \ mesh \ tests -# apps + +if ENABLE_APPS + SUBDIRS += apps +endif ENABLE_APPS .PHONY: doc tutorial tools -- 1.6.1.2

1 0

[PATCH 12/31] Address comparisons of signed vs unsigned in apps/statues/.
by Roland Levillain 15 May '09

15 May '09

* apps/statues/io.hh: Use unsigned loop indices. --- milena/ChangeLog | 6 ++++++ milena/apps/statues/io.hh | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 9bef11c..5ed7f50 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Address comparisons of signed vs unsigned in apps/statues/. + + * apps/statues/io.hh: Use unsigned loop indices. + +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + * mln/topo/skeleton/breadth_first_thinning.hh: Aesthetic changes. 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/apps/statues/io.hh b/milena/apps/statues/io.hh index 04ce871..cbced91 100644 --- a/milena/apps/statues/io.hh +++ b/milena/apps/statues/io.hh @@ -55,7 +55,7 @@ inline void write_verts_asc(TriMesh *mesh, FILE *f, const char *before_conf, const char *after_line) { - for (int i = 0; i < mesh->vertices.size(); i++) { + for (unsigned i = 0; i < mesh->vertices.size(); i++) { fprintf(f, "%s%.7g %.7g %.7g", before_vert, mesh->vertices[i][0], mesh->vertices[i][1], @@ -98,7 +98,7 @@ inline void write_faces_asc_colored(TriMesh *mesh, const char *after_line) { mesh->need_faces(); - for (int i = 0; i < mesh->faces.size(); i++) + for (unsigned i = 0; i < mesh->faces.size(); i++) { fprintf(f, "%s%d %d %d %d %d %d%s\n", before_face, @@ -135,7 +135,7 @@ inline void write_faces_asc_float(TriMesh *mesh, const char *after_line) { mesh->need_faces(); - for (int i = 0; i < mesh->faces.size(); i++) + for (unsigned i = 0; i < mesh->faces.size(); i++) { // Vertices Color // -------- ------------ @@ -177,7 +177,7 @@ inline void write_faces_asc_binary(TriMesh *mesh, const char *after_line) { mesh->need_faces(); - for (int i = 0; i < mesh->faces.size(); i++) + for (unsigned i = 0; i < mesh->faces.size(); i++) if (face_value[i]) { fprintf(f, "%s%d %d %d%s\n", -- 1.6.1.2

1 0

[PATCH 11/31] mln/topo/skeleton/breadth_first_thinning.hh: Aesthetic changes.
by Roland Levillain 15 May '09

15 May '09

--- milena/ChangeLog | 4 ++++ milena/mln/topo/skeleton/breadth_first_thinning.hh | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f7d67b5..9bef11c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + * mln/topo/skeleton/breadth_first_thinning.hh: Aesthetic changes. + +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless #include's. * mln/morpho/line_gradient.hh: diff --git a/milena/mln/topo/skeleton/breadth_first_thinning.hh b/milena/mln/topo/skeleton/breadth_first_thinning.hh index 6c28410..72f4d09 100644 --- a/milena/mln/topo/skeleton/breadth_first_thinning.hh +++ b/milena/mln/topo/skeleton/breadth_first_thinning.hh @@ -92,16 +92,14 @@ namespace mln F& is_simple = exact(is_simple_); const H& constraint = exact(constraint_); - typedef mln_psite(I) psite; - I output = duplicate(input); // Attach the work image to IS_SIMPLE. is_simple.set_image(output); + typedef mln_psite(I) psite; typedef p_set<psite> set_t; set_t set; - - // Populate the set with candiate simple points. + // Populate SET with candidate simple points. mln_piter(I) p_(output.domain()); for_all(p_) { -- 1.6.1.2

1 0

[PATCH 10/31] Remove useless #include's.
by Roland Levillain 15 May '09

15 May '09

* mln/morpho/line_gradient.hh: * apps/statues/mesh-complex-max-curv.cc: Here. --- milena/ChangeLog | 8 ++++++++ milena/apps/statues/mesh-complex-max-curv.cc | 3 --- milena/mln/morpho/line_gradient.hh | 2 -- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e83522a..f7d67b5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Remove useless #include's. + + * mln/morpho/line_gradient.hh: + * apps/statues/mesh-complex-max-curv.cc: + Here. + +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Have apps/statues/ catch up with Milena's current interface. * apps/statues/mesh-complex-max-curv-segm.cc, diff --git a/milena/apps/statues/mesh-complex-max-curv.cc b/milena/apps/statues/mesh-complex-max-curv.cc index 5c93d7d..5c095f8 100644 --- a/milena/apps/statues/mesh-complex-max-curv.cc +++ b/milena/apps/statues/mesh-complex-max-curv.cc @@ -39,9 +39,6 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/morpho/closing_area.hh> -#include <mln/morpho/meyer_wst.hh> - #include <mln/data/fill.hh> #include <mln/literal/zero.hh> diff --git a/milena/mln/morpho/line_gradient.hh b/milena/mln/morpho/line_gradient.hh index 32b5975..c0c6018 100644 --- a/milena/mln/morpho/line_gradient.hh +++ b/milena/mln/morpho/line_gradient.hh @@ -40,8 +40,6 @@ # include <mln/math/abs.hh> -# include <mln/util/ord.hh> - # include <mln/core/image/image2d.hh> # include <mln/core/image/edge_image.hh> # include <mln/core/alias/window2d.hh> -- 1.6.1.2

1 0

[PATCH 09/31] Have apps/statues/ catch up with Milena's current interface.
by Roland Levillain 15 May '09

15 May '09

* apps/statues/mesh-complex-max-curv-segm.cc, * apps/statues/mesh-complex-segm.cc, * apps/statues/mesh-segm.cc, * apps/statues/mesh-skel.cc: Adjust to the current interface of mln::morpho::closing::area. --- milena/ChangeLog | 10 ++++++++++ milena/apps/statues/mesh-complex-max-curv-segm.cc | 4 ++-- milena/apps/statues/mesh-complex-segm.cc | 4 ++-- milena/apps/statues/mesh-segm.cc | 7 +++---- milena/apps/statues/mesh-skel.cc | 7 +++---- 5 files changed, 20 insertions(+), 12 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3609d23..e83522a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Have apps/statues/ catch up with Milena's current interface. + + * apps/statues/mesh-complex-max-curv-segm.cc, + * apps/statues/mesh-complex-segm.cc, + * apps/statues/mesh-segm.cc, + * apps/statues/mesh-skel.cc: + Adjust to the current interface of mln::morpho::closing::area. + +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + * doc/.gitignore: Add headers.stamp. 2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> diff --git a/milena/apps/statues/mesh-complex-max-curv-segm.cc b/milena/apps/statues/mesh-complex-max-curv-segm.cc index 37d4fbb..389f977 100644 --- a/milena/apps/statues/mesh-complex-max-curv-segm.cc +++ b/milena/apps/statues/mesh-complex-max-curv-segm.cc @@ -39,7 +39,7 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/math/max.hh> @@ -131,7 +131,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); + ima_t closed_input = mln::morpho::closing::area(input, adj_edges_nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/mesh-complex-segm.cc b/milena/apps/statues/mesh-complex-segm.cc index ab049fc..c4a6dd0 100644 --- a/milena/apps/statues/mesh-complex-segm.cc +++ b/milena/apps/statues/mesh-complex-segm.cc @@ -39,7 +39,7 @@ #include <mln/core/image/complex_image.hh> #include <mln/core/image/complex_neighborhoods.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include <mln/literal/white.hh> @@ -106,7 +106,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); + ima_t closed_input = mln::morpho::closing::area(input, adj_edges_nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/mesh-segm.cc b/milena/apps/statues/mesh-segm.cc index 46391a1..e24fe6b 100644 --- a/milena/apps/statues/mesh-segm.cc +++ b/milena/apps/statues/mesh-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -46,7 +46,7 @@ #include <mln/core/image/line_graph_image.hh> #include <mln/core/image/line_graph_elt_neighborhood.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/morpho/meyer_wst.hh> #include "io.hh" @@ -173,8 +173,7 @@ int main(int argc, char* argv[]) typedef mln::line_graph_elt_neighborhood<mln::point3d> nbh_t; nbh_t nbh; - ima_t closed_lg_ima (lg_ima.domain()); - mln::morpho::closing_area(lg_ima, nbh, lambda, closed_lg_ima); + ima_t closed_lg_ima = mln::morpho::closing::area(lg_ima, nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/mesh-skel.cc b/milena/apps/statues/mesh-skel.cc index c4fd0f2..4b2d002 100644 --- a/milena/apps/statues/mesh-skel.cc +++ b/milena/apps/statues/mesh-skel.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -46,7 +46,7 @@ #include <mln/core/image/graph_image.hh> #include <mln/core/image/graph_elt_neighborhood.hh> -#include <mln/morpho/closing_area.hh> +#include <mln/morpho/closing/area.hh> #include <mln/labeling/regional_minima.hh> #include "io.hh" @@ -155,8 +155,7 @@ int main(int argc, char* argv[]) typedef mln::graph_elt_neighborhood<mln::point3d> nbh_t; nbh_t nbh; - ima_t closed_g_ima (g_ima.domain()); - mln::morpho::closing_area(g_ima, nbh, lambda, closed_g_ima); + ima_t closed_g_ima = mln::morpho::closing::area(g_ima, nbh, lambda); /*------------------. | Regional minima. | -- 1.6.1.2

1 0

[PATCH 08/31] doc/.gitignore: Add headers.stamp.
by Roland Levillain 15 May '09

15 May '09

--- milena/ChangeLog | 4 ++++ milena/doc/.gitignore | 1 + 2 files changed, 5 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 4c6fc7e..3609d23 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + * doc/.gitignore: Add headers.stamp. + 2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> Canonicalize tests/io/fits/Makefile.am. diff --git a/milena/doc/.gitignore b/milena/doc/.gitignore index 642caef..f107fe3 100644 --- a/milena/doc/.gitignore +++ b/milena/doc/.gitignore @@ -1,2 +1,3 @@ /Doxyfile +/headers.stamp /html/ -- 1.6.1.2

1 0

[PATCH 07/31] Improve configure.ac w.r.t. Trimesh.
by Roland Levillain 15 May '09

15 May '09

* m4/trimesh.m4: Remove, and move relevant lines... * configure.ac: ...here. Adjust. * external/Makefile.am: Adjust. --- ChangeLog | 9 +++++++++ configure.ac | 19 ++++++++++++++----- external/Makefile.am | 4 ++-- m4/trimesh.m4 | 18 ------------------ 4 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 m4/trimesh.m4 diff --git a/ChangeLog b/ChangeLog index bbbd398..3f7ea4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2009-05-11 Roland Levillain <roland(a)lrde.epita.fr> + + Improve configure.ac w.r.t. Trimesh. + + * m4/trimesh.m4: Remove, and move relevant lines... + * configure.ac: ...here. + Adjust. + * external/Makefile.am: Adjust. + 2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> Have Makefile.am be more portable. diff --git a/configure.ac b/configure.ac index d08aec7..6b46bc8 100644 --- a/configure.ac +++ b/configure.ac @@ -111,20 +111,29 @@ AC_CANONICAL_HOST AM_CONDITIONAL([DARWIN], [echo "$host_os" | grep '^darwin']) -# (Bundled) trimesh2 library. -OLN_WITH_TRIMESH -AC_CONFIG_SUBDIRS([external/trimesh]) -AM_CONDITIONAL([WITH_TRIMESH], [test x$with_trimesh = xyes]) +## -------------------- ## +## External libraries. ## +## -------------------- ## # FreeImage library. OLN_WITH_FREEIMAGEPLUS AM_CONDITIONAL([FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes]) -# Cfitsio library. +# CFITSIO library. OLN_WITH_CFITSIO AM_CONDITIONAL([CFITSIO], [test x$oln_have_cfitsio = xyes]) +## ---------------------------- ## +## (Bundled) trimesh2 library. ## +## ---------------------------- ## + +AC_ARG_ENABLE([trimesh], + [AS_HELP_STRING([--with-trimesh], + [build the (bundled) trimesh2 library])]) +AM_CONDITIONAL([ENABLE_TRIMESH], [test x$enable_trimesh = xyes]) +AC_CONFIG_SUBDIRS([external/trimesh]) + ## --------- ## ## Swilena. ## ## --------- ## diff --git a/external/Makefile.am b/external/Makefile.am index e288aa7..73896d3 100644 --- a/external/Makefile.am +++ b/external/Makefile.am @@ -2,6 +2,6 @@ SUBDIRS = -if WITH_TRIMESH +if ENABLE_TRIMESH SUBDIRS += trimesh -endif WITH_TRIMESH +endif ENABLE_TRIMESH diff --git a/m4/trimesh.m4 b/m4/trimesh.m4 deleted file mode 100644 index 11d8ca6..0000000 --- a/m4/trimesh.m4 +++ /dev/null @@ -1,18 +0,0 @@ -# -*- Autoconf -*- - -# OLN_WITH_TRIMESH(WITH, WITHOUT) -# ------------------------------- -# Should we build Trimesh or not. -AC_DEFUN([OLN_WITH_TRIMESH], -[AC_ARG_WITH([trimesh], - [AS_HELP_STRING([--with-trimesh], - [build the Trimesh library])], - [], - [with_trimesh=no]) - -case $with_trimesh in - yes) $1;; - no ) $2;; - *) AC_MSG_ERROR([incorrect with_trimesh value: $with_trimesh]);; -esac -]) -- 1.6.1.2

1 0

[PATCH 06/31] Have Makefile.am be more portable.
by Roland Levillain 15 May '09

15 May '09

* Makefile.am (doc): Do not use make's `-C' option. --- ChangeLog | 6 ++++++ Makefile.am | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 05a0d4f..bbbd398 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + Have Makefile.am be more portable. + + * Makefile.am (doc): Do not use make's `-C' option. + +2009-04-16 Roland Levillain <roland(a)lrde.epita.fr> + Fix messages in m4/freeimageplus.m4. * m4/freeimageplus.m4: s/FreeImage/FreeImagePlus/g. diff --git a/Makefile.am b/Makefile.am index ef05249..6e5120f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,10 +4,11 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = build-aux external milena -.PHONY: doc -doc: - $(MAKE) -C milena doc - if ENABLE_SWILENA SUBDIRS += swilena endif ENABLE_SWILENA + +# Shortcut to generate the documentation from the top level. +.PHONY: doc +doc: + cd milena && $(MAKE) $(AM_MAKEFLAGS) $@ -- 1.6.1.2

1 0