From be756642bf96bffcd70a92af37caa398f1e82c57 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Thu, 21 Jun 2012 01:27:15 +0200 Subject: [PATCH] [ng] refactoring: move definition of $(am__mv) in depend2.am A tiny refactoring only needed by the subsequent change. * lib/am/depend.am (am__mv): Move definition ... * lib/am/depend2.am [%?FIRST%]: ... here, with a new explicative comment. Signed-off-by: Stefano Lattarini --- automake.in | 4 ++-- lib/am/depend.am | 1 - lib/am/depend2.am | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/automake.in b/automake.in index 49c98066d..a7ccc607c 100644 --- a/automake.in +++ b/automake.in @@ -1862,7 +1862,7 @@ sub handle_single_transform ($$$$$%) err_am "'$full' should not contain a '..' component"; } - # Make sure *all* objects files in the subdirectory are + # Make sure *all* object files in the subdirectory are # removed by "make mostlyclean". Not only this is more # efficient than listing the object files to be removed # individually (which would cause an 'rm' invocation for @@ -1873,7 +1873,7 @@ sub handle_single_transform ($$$$$%) if ($object =~ /\.lo$/) { # If we have a libtool object, then we also must remove - # any '.lo' objects in its same subdirectory. + # any '.lo' objects in the same subdirectory. $compile_clean_files{"$directory/*.lo"} = MOSTLY_CLEAN; # Remember to cleanup .libs/ in this directory. $libtool_clean_directories{$directory} = 1; diff --git a/lib/am/depend.am b/lib/am/depend.am index a53ecbe00..dc7bc8b36 100644 --- a/lib/am/depend.am +++ b/lib/am/depend.am @@ -14,6 +14,5 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -am__mv = mv -f am__distclean_dirs += %DEPDIRS% am__maintclean_dirs += %DEPDIRS% diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 38f30bf00..2601434de 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -39,6 +39,8 @@ am__depbase = $(am__depdir)/$(basename $(notdir $@)) ## Avoid useless forks when possible. am__ensure_depdir = $(call am__ensure_dir_exists,$(am__depdir)) am__o_src = $(if $(filter .obj,$(suffix $@)),`$(CYGPATH_W) $<`,$<) +## To facilitate use of "libtool --dry-run". +am__mv = mv -f endif %?FIRST% if %?NONLIBTOOL% -- 2.47.2