[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 <stefano.lattarini@gmail.com>

diff --git a/automake.in b/automake.in
index 49c98066dca0a874e1970a023c356a2eea465545..a7ccc607c38427934ff4473d5421cb055305c79e 100644 (file)
--- 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 a53ecbe005e2ad5e077e9bb287b3531244d9990d..dc7bc8b36d6c7461054298f0671c335a31c25f5a 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 
-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 38f30bf00f17246dea92904f3e7c1365cca63799..2601434de42a797565e13a7d30919a208e57b4af 100644 (file)
--- 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%