- Olena-patches

olena: olena-2.0-896-g484dc65 configure.ac: Aesthetic changes.
by Roland Levillain 27 Jun '14

27 Jun '14

--- ChangeLog | 4 ++++ configure.ac | 27 ++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index ab7be69..262744c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + * configure.ac: Aesthetic changes. + +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + Use AX_CHECK_COMPILE_FLAG to check compiler support for `-pipe'. * configure.ac: Here. diff --git a/configure.ac b/configure.ac index be32513..e5b8417 100644 --- a/configure.ac +++ b/configure.ac @@ -78,21 +78,18 @@ test $CXX --version 2>/dev/null | grep '\bICC\b' >/dev/null 2>&1 && ICPC=yes # Try to use pipes between compiler stages to speed the compilation up. AX_CHECK_COMPILE_FLAG([-pipe], [CXXFLAGS="$CXXFLAGS -pipe"]) -# GNU C++ compiler setup. -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. - # 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 +# 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/data/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 test "$GXX" = yes \ + && $CXX --version | head -n 1 | grep '\b4\.2' >/dev/null 2>&1; then + STRICT_ALIASING_CXXFLAGS=-fno-strict-aliasing fi AC_SUBST([STRICT_ALIASING_CXXFLAGS]) -- 1.7.10.4

1 0

olena: olena-2.0-895-g0774ab7 Use AX_CHECK_COMPILE_FLAG to check compiler support for `-pipe'.
by Roland Levillain 27 Jun '14

27 Jun '14

* configure.ac: Here. --- ChangeLog | 6 ++++++ configure.ac | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee0aacd..ab7be69 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + Use AX_CHECK_COMPILE_FLAG to check compiler support for `-pipe'. + + * configure.ac: Here. + +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + Avoid warnings about unused local typedefs. * m4/ax_check_compile_flag.m4: New. diff --git a/configure.ac b/configure.ac index 6dadbea..be32513 100644 --- a/configure.ac +++ b/configure.ac @@ -75,10 +75,11 @@ 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 +# Try to use pipes between compiler stages to speed the compilation up. +AX_CHECK_COMPILE_FLAG([-pipe], [CXXFLAGS="$CXXFLAGS -pipe"]) + # 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 -- 1.7.10.4

1 0

olena: olena-2.0-894-gc12d92c Avoid warnings about unused local typedefs.
by Roland Levillain 27 Jun '14

27 Jun '14

* m4/ax_check_compile_flag.m4: New. Imported from http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html. * configure.ac: Ensure AX_* macros are expanded. (WARNINGS_CXXFLAGS): Add `-Wno-unused-local-typedefs' if the C++ compiler supports this flag. --- ChangeLog | 11 +++++++ configure.ac | 11 +++++-- m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 94 insertions(+), 2 deletions(-) create mode 100644 m4/ax_check_compile_flag.m4 diff --git a/ChangeLog b/ChangeLog index c8c159b..ee0aacd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2014-06-27 Roland Levillain <roland(a)lrde.epita.fr> + + Avoid warnings about unused local typedefs. + + * m4/ax_check_compile_flag.m4: New. + Imported from + http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html. + * configure.ac: Ensure AX_* macros are expanded. + (WARNINGS_CXXFLAGS): Add `-Wno-unused-local-typedefs' if the C++ + compiler supports this flag. + 2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> Make Olena more compatible with BSD Make. diff --git a/configure.ac b/configure.ac index a9c59e5..6dadbea 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 EPITA +# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 EPITA # Research and Development Laboratory (LRDE). # # This file is part of Olena. @@ -15,7 +15,8 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -m4_pattern_forbid([^OLN_]) +dnl Catch macros that are not expanded. +m4_pattern_forbid([^(AX|OLN)_]) AC_PREREQ([2.61]) @@ -107,6 +108,12 @@ case "$CXX" in ;; esac +# Avoid warnings about unused local typedefs, which are used as a +# concept checking means in Milena (`-Wunused-local-typedefs' is +# enabled by `-Wall' in GCC since version 4.8). +AX_CHECK_COMPILE_FLAG([-Wno-unused-local-typedefs], + [WARNINGS_CXXFLAGS="$WARNINGS_CXXFLAGS -Wno-unused-local-typedefs"]) + # ------------------------------ # # C++ compiler flags for tests. # diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 new file mode 100644 index 0000000..51df0c0 --- /dev/null +++ b/m4/ax_check_compile_flag.m4 @@ -0,0 +1,74 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) +# +# DESCRIPTION +# +# Check whether the given FLAG works with the current language's compiler +# or gives an error. (Warnings, however, are ignored) +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# If EXTRA-FLAGS is defined, it is added to the current language's default +# flags (e.g. CFLAGS) when the check is done. The check is thus made with +# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to +# force the compiler to issue an error when a bad flag is given. +# +# INPUT gives an alternative input source to AC_COMPILE_IFELSE. +# +# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this +# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. +# +# LICENSE +# +# Copyright (c) 2008 Guido U. Draheim <guidod(a)gmx.de> +# Copyright (c) 2011 Maarten Bosmans <mkbosmans(a)gmail.com> +# +# 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/>. +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 3 + +AC_DEFUN([AX_CHECK_COMPILE_FLAG], +[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX +AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl +AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ + ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS + _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" + AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], + [AS_VAR_SET(CACHEVAR,[yes])], + [AS_VAR_SET(CACHEVAR,[no])]) + _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) +AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], + [m4_default([$2], :)], + [m4_default([$3], :)]) +AS_VAR_POPDEF([CACHEVAR])dnl +])dnl AX_CHECK_COMPILE_FLAGS -- 1.7.10.4

1 0

olena: branch next updated: olena-2.0-893-g5ec6227
by git＠lrde.epita.fr 27 Jun '14

27 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated discards 974162bb578fd0e49dadd6be3007a0f81b0231d2 (commit) discards f5f0cfb89d8d6e4c4c4dba01333d548ddda44675 (commit) via 5ec622732f36db381fd3cead7f88c448e0119359 (commit) via 84106cfffb04189d1e3bbdd527c06e93b6c24d14 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (974162bb578fd0e49dadd6be3007a0f81b0231d2) \ N -- N -- N (5ec622732f36db381fd3cead7f88c448e0119359) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 5ec6227 Make dynamic-use-of-static-c++ more compatible with BSD Make. 84106cf Make Swilena more compatible with BSD Make. ----------------------------------------------------------------------- Summary of changes: swilena/python/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-893-g974162b
by git＠lrde.epita.fr 26 Jun '14

26 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 974162bb578fd0e49dadd6be3007a0f81b0231d2 (commit) via f5f0cfb89d8d6e4c4c4dba01333d548ddda44675 (commit) via 96938fc1c582b4003ad92cdc0fcacd91c6b72b50 (commit) via c2ba187b43551cac9e4e90fdab2d7458dae649df (commit) via e0131fc77551bcfe8cef82b1ce5470efc9124ef2 (commit) via 45bcbda3991f1aae4eb682ce8247fb6928918741 (commit) from 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 974162b Make dynamic-use-of-static-c++ more compatible with BSD Make. f5f0cfb Make Swilena more compatible with BSD Make. 96938fc Make Scribo more compatible with BSD Make. c2ba187 Regen Milena's Makefile bits in doc/. e0131fc Make Milena more compatible with BSD Make. 45bcbda Make Olena more compatible with BSD Make. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 6 + doc/Makefile.am | 14 +- dynamic-use-of-static-c++/ChangeLog | 6 + dynamic-use-of-static-c++/data/Makefile.am | 7 +- milena/ChangeLog | 28 ++ milena/Makefile.am | 7 +- milena/apps/bench/Makefile.am | 7 +- milena/apps/morphers/Makefile.am | 4 +- milena/apps/papers/levillain.09.ismm/Makefile.am | 24 +- milena/doc/Makefile.am | 36 +-- milena/doc/examples-outputs.mk | 204 +++++++-------- milena/doc/figures.mk | 48 ++-- milena/doc/gen-examples-outputs-mk | 6 +- milena/doc/gen-figures-mk | 4 +- milena/doc/gen-split-examples-mk | 8 +- milena/doc/gen-split-outputs-mk | 6 +- milena/doc/split-examples.mk | 300 +++++++++++----------- milena/doc/split-outputs.mk | 18 +- milena/tests/unit_test/Makefile.am | 5 +- milena/tools/Makefile.am | 11 +- scribo/ChangeLog | 9 + scribo/Makefile.am | 5 +- scribo/doc/Makefile.am | 12 +- scribo/tests/unit_test/Makefile.am | 5 +- swilena/ChangeLog | 6 + swilena/python/Makefile.am | 6 +- 26 files changed, 427 insertions(+), 365 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-893-g5ec6227 Make dynamic-use-of-static-c++ more compatible with BSD Make.
by Roland Levillain 26 Jun '14

26 Jun '14

* data/Makefile.am: Do not use `$<' outside suffix rules. --- dynamic-use-of-static-c++/ChangeLog | 6 ++++++ dynamic-use-of-static-c++/data/Makefile.am | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index c990c1b..2881313 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,9 @@ +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Make dynamic-use-of-static-c++ more compatible with BSD Make. + + * data/Makefile.am: Do not use `$<' outside suffix rules. + 2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> Convert dynamic-use-of-static-c++ to UTF-8. diff --git a/dynamic-use-of-static-c++/data/Makefile.am b/dynamic-use-of-static-c++/data/Makefile.am index 698b1f8..1c1137c 100644 --- a/dynamic-use-of-static-c++/data/Makefile.am +++ b/dynamic-use-of-static-c++/data/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2014 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -27,7 +28,7 @@ libdyn_function_la_SOURCES = function.cc pkgdata_DATA = Makefile.template Makefile.repository Makefile.template: Makefile - cat $< | \ + cat Makefile | \ sed -e 's|^srcdir = .*|srcdir = '`cd $(srcdir) && pwd`'|' \ -e 's|^top_srcdir = .*|top_srcdir = '`cd $(top_srcdir) && pwd`'|' \ -e 's|^top_builddir = .*|top_builddir = '`cd $(top_builddir) && pwd`'|' \ @@ -37,7 +38,7 @@ Makefile.template: Makefile -e 's|^VPATH = .*|VPATH = .|' > $@ Makefile.repository: Makefile - cat $< | \ + cat Makefile | \ sed -e 's|^srcdir = .*|srcdir = '`cd $(srcdir) && pwd`'|' \ -e 's|^top_srcdir = .*|top_srcdir = '`cd $(top_srcdir) && pwd`'|' \ -e 's|^top_builddir = .*|top_builddir = '`cd $(top_builddir) && pwd`'|' \ -- 1.7.10.4

1 0

olena: olena-2.0-893-g974162b Make dynamic-use-of-static-c++ more compatible with BSD Make.
by Roland Levillain 26 Jun '14

26 Jun '14

* data/Makefile.am: Do not use `$<' outside suffix rules. --- dynamic-use-of-static-c++/ChangeLog | 6 ++++++ dynamic-use-of-static-c++/data/Makefile.am | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index c990c1b..2881313 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,9 @@ +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Make dynamic-use-of-static-c++ more compatible with BSD Make. + + * data/Makefile.am: Do not use `$<' outside suffix rules. + 2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> Convert dynamic-use-of-static-c++ to UTF-8. diff --git a/dynamic-use-of-static-c++/data/Makefile.am b/dynamic-use-of-static-c++/data/Makefile.am index 698b1f8..1c1137c 100644 --- a/dynamic-use-of-static-c++/data/Makefile.am +++ b/dynamic-use-of-static-c++/data/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2005, 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2005, 2009, 2014 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -27,7 +28,7 @@ libdyn_function_la_SOURCES = function.cc pkgdata_DATA = Makefile.template Makefile.repository Makefile.template: Makefile - cat $< | \ + cat Makefile | \ sed -e 's|^srcdir = .*|srcdir = '`cd $(srcdir) && pwd`'|' \ -e 's|^top_srcdir = .*|top_srcdir = '`cd $(top_srcdir) && pwd`'|' \ -e 's|^top_builddir = .*|top_builddir = '`cd $(top_builddir) && pwd`'|' \ @@ -37,7 +38,7 @@ Makefile.template: Makefile -e 's|^VPATH = .*|VPATH = .|' > $@ Makefile.repository: Makefile - cat $< | \ + cat Makefile | \ sed -e 's|^srcdir = .*|srcdir = '`cd $(srcdir) && pwd`'|' \ -e 's|^top_srcdir = .*|top_srcdir = '`cd $(top_srcdir) && pwd`'|' \ -e 's|^top_builddir = .*|top_builddir = '`cd $(top_builddir) && pwd`'|' \ -- 1.7.10.4

1 0

olena: olena-2.0-892-g84106cf Make Swilena more compatible with BSD Make.
by Roland Levillain 26 Jun '14

26 Jun '14

* python/Makefile.am: Do not use `$<' outside suffix rules. --- swilena/ChangeLog | 6 ++++++ swilena/python/Makefile.am | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index c7daa94..ddae73d 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Make Swilena more compatible with BSD Make. + + * python/Makefile.am: Do not use `$<' outside suffix rules. + 2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> Remove extended characters from Swilena. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index d77cdc4..0ad0f4e 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010, 2012, 2013, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -65,9 +65,9 @@ python_PYTHON = swilena.py # generated, in our case), according to Automake's manual, all-local: data.py EXTRA_DIST = data.py.in -data.py: data.py.in Makefile +data.py: $(srcdir)/data.py.in Makefile rm -f $@ $@.tmp - $(edit) $< >$@.tmp + $(edit) $(srcdir)/data.py.in >$@.tmp chmod a-w $@.tmp mv $@.tmp $@ -- 1.7.10.4

1 0

olena: olena-2.0-892-gf5f0cfb Make Swilena more compatible with BSD Make.
by Roland Levillain 26 Jun '14

26 Jun '14

* python/Makefile.am: Do not use `$<' outside suffix rules. --- swilena/ChangeLog | 6 ++++++ swilena/python/Makefile.am | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index c7daa94..ddae73d 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Make Swilena more compatible with BSD Make. + + * python/Makefile.am: Do not use `$<' outside suffix rules. + 2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> Remove extended characters from Swilena. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index d77cdc4..b72bc18 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2008, 2009, 2010, 2012, 2013 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010, 2012, 2013, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -67,7 +67,7 @@ all-local: data.py EXTRA_DIST = data.py.in data.py: data.py.in Makefile rm -f $@ $@.tmp - $(edit) $< >$@.tmp + $(edit) data.py.in >$@.tmp chmod a-w $@.tmp mv $@.tmp $@ -- 1.7.10.4

1 0

olena: olena-2.0-891-g96938fc Make Scribo more compatible with BSD Make.
by Roland Levillain 26 Jun '14

26 Jun '14

* doc/Makefile.am: Do not use `$<' outside suffix rules. * Makefile.am, * tests/unit_test/Makefile.am: Adjust comments. --- scribo/ChangeLog | 9 +++++++++ scribo/Makefile.am | 5 +++-- scribo/doc/Makefile.am | 12 ++++++------ scribo/tests/unit_test/Makefile.am | 5 +++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2e4bc02..cdcb6c0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Make Scribo more compatible with BSD Make. + + * doc/Makefile.am: Do not use `$<' outside suffix rules. + * Makefile.am, + * tests/unit_test/Makefile.am: + Adjust comments. + 2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> Convert Scribo to UTF-8. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 9dd3d76..01bce66 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2012, 2014 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -36,7 +36,8 @@ regen-am: # FIXME: Change generate_dist_headers.sh so that the action looks like this: # -# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ +# $(top_srcdir)/build-aux/generate_dist_headers.sh \ +# $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh cd $(srcdir) \ diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 16a5b6c..14ce71c 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -56,7 +56,7 @@ edit = sed -e "s|@ID[@]|$(ID)|" \ -e 's,@builddir[@],$(builddir),g' $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in - $(edit) $< >$@ + $(edit) $(srcdir)/$(DOXYFILE).in >$@ MAINTAINERCLEANFILES = $(DOXYFILE_USER) USER_REFMAN = user-refman @@ -94,8 +94,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(srcdir)/$(USER_REFMAN): $(srcdir)/user-refman.stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/user-refman.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/user-refman.stamp; \ fi # Installing a directory located in the source dir is not supported by @@ -137,7 +137,7 @@ edit_devel = sed \ $(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in rm -f $@.tmp - $(edit) $< >$@.tmp + $(edit) $(srcdir)/$(DOXYFILE).in >$@.tmp $(edit_devel) $@.tmp >$@ rm -f $@.tmp MAINTAINERCLEANFILES += $(DOXYFILE_DEVEL) @@ -176,8 +176,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/devel-refman.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/devel-refman.stamp; \ fi ## -------------- ## diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index c5b2621..afdb1c6 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2014 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -48,7 +48,8 @@ regen-am: # FIXME: Change build_unit_test.sh so that the action looks like this: # -# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ +# $(top_srcdir)/build-aux/build_unit_test.sh \ +# $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # # `$(abs_top_srcdir)' is required because of the change of directory # at the beginning og the action. -- 1.7.10.4

1 0