From 63316731bbbfefbd1d27efd882fef9bad2e9d651 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Wed, 18 Jun 2008 00:37:42 +0200 Subject: [PATCH] Introduce macro $(am__mv) to facilitate 'libtool --dry-run'. * lib/am/depend.am (am__mv): New macro, set to 'mv -f'. * lib/am/depend2.am: Use throughout to move the temporary depfile *.Tpo to its final destination *.Po. Signed-off-by: Ralf Wildenhues --- ChangeLog | 7 +++++++ lib/am/depend.am | 4 +++- lib/am/depend2.am | 8 ++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61fb1074a..6da71e99e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-06-18 Ralf Wildenhues + + Introduce macro $(am__mv) to facilitate 'libtool --dry-run'. + * lib/am/depend.am (am__mv): New macro, set to 'mv -f'. + * lib/am/depend2.am: Use throughout to move the temporary + depfile *.Tpo to its final destination *.Po. + 2008-06-18 Rafael Espindola * lib/config-ml.in: don't handle --enable-shared and --enable-static. diff --git a/lib/am/depend.am b/lib/am/depend.am index c2bec7d09..62d72f99b 100644 --- a/lib/am/depend.am +++ b/lib/am/depend.am @@ -1,5 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003 +## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2003, 2008 ## Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify @@ -15,6 +15,8 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . +am__mv = mv -f + ## This Makefile depends on Depdirs' files, so we should never ## erase them in -am or -recursive rules; that would prevent any other ## rules from being recursive (for instance multilib clean rules are diff --git a/lib/am/depend2.am b/lib/am/depend2.am index 7bbe18873..1a13bd2b3 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -1,6 +1,6 @@ ## automake - create Makefile.in from Makefile.am ## Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -## 2003, 2004, 2006 Free Software Foundation, Inc. +## 2003, 2004, 2006, 2008 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 @@ -67,7 +67,7 @@ if %FASTDEP% ?GENERIC??!SUBDIROBJ? %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE% ?GENERIC??SUBDIROBJ? depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ ?GENERIC??SUBDIROBJ? %COMPILE% -MT %OBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJ% %SOURCEFLAG%%SOURCE% &&\ - mv -f %DEPBASE%.Tpo %DEPBASE%.Po + $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po else !%FASTDEP% if %AMDEP% source='%SOURCE%' object='%OBJ%' libtool=no @AMDEPBACKSLASH@ @@ -92,7 +92,7 @@ if %FASTDEP% ?GENERIC??!SUBDIROBJ? %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` ?GENERIC??SUBDIROBJ? depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\ ?GENERIC??SUBDIROBJ? %COMPILE% -MT %OBJOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %OBJOBJ% %SOURCEFLAG%`$(CYGPATH_W) '%SOURCE%'` &&\ - mv -f %DEPBASE%.Tpo %DEPBASE%.Po + $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Po else !%FASTDEP% if %AMDEP% source='%SOURCE%' object='%OBJOBJ%' libtool=no @AMDEPBACKSLASH@ @@ -119,7 +119,7 @@ if %FASTDEP% ?GENERIC??!SUBDIROBJ? %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE% ?GENERIC??SUBDIROBJ? depbase=`echo %OBJ% | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\ ?GENERIC??SUBDIROBJ? %LTCOMPILE% -MT %LTOBJ% -MD -MP -MF %DEPBASE%.Tpo %-c% -o %LTOBJ% %SOURCEFLAG%%SOURCE% &&\ - mv -f %DEPBASE%.Tpo %DEPBASE%.Plo + $(am__mv) %DEPBASE%.Tpo %DEPBASE%.Plo else !%FASTDEP% if %AMDEP% source='%SOURCE%' object='%LTOBJ%' libtool=yes @AMDEPBACKSLASH@ -- 2.47.2