[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.2b-14-gbf95acc

[Stefano Lattarini]

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 "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=bf95acc6d36aa5e898b8be506322d7d59d211f0a

The branch, branch-1.11 has been updated
       via  bf95acc6d36aa5e898b8be506322d7d59d211f0a (commit)
       via  2a2f57fc8b5a10d82c6797b62b2c9244144c300e (commit)
       via  41404a8feb40b1d5853a45e6f8306daee6dc6607 (commit)
       via  32cde2a4722d25ad41e5ae2e33d43ceb2c6f4a90 (commit)
      from  4fbec2fffe9d98470b3c5d1d03a94e32660366b0 (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 -----------------------------------------------------------------
commit bf95acc6d36aa5e898b8be506322d7d59d211f0a
Merge: 4fbec2f 2a2f57f 32cde2a
Author: Stefano Lattarini <address@hidden>
Date:   Tue Jan 31 08:14:05 2012 +0100

    Merge branches 'msvc' and 'maint' into branch-1.11
    
    * msvc:
      ar-lib: ignore the verbose modifier instead of erroring out
      scripts: cherry-pick recent changes from master
    
    * maint:
      tests: do not assume the object file extension is .o

-----------------------------------------------------------------------

Summary of changes:
 lib/ar-lib          |   10 +++++-----
 lib/compile         |   30 +++++++++++++++---------------
 tests/specflg7.test |    7 ++++---
 tests/specflg8.test |    7 ++++---
 tests/substref.test |    5 +++--
 tests/suffix8.test  |    5 ++++-
 6 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/lib/ar-lib b/lib/ar-lib
index 4883fef..c0286a4 100755
--- a/lib/ar-lib
+++ b/lib/ar-lib
@@ -2,10 +2,9 @@
 # Wrapper for Microsoft lib.exe
 
 me=ar-lib
-scriptversion=2010-09-02.19; # UTC
+scriptversion=2012-01-30.22; # UTC
 
-# Copyright (C) 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 2010, 2012 Free Software Foundation, Inc.
 # Written by Peter Rosin <address@hidden>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -42,7 +41,7 @@ file_conv=
 
 # func_file_conv build_file
 # Convert a $build file to $host form and store it in $file
-# Currently only supports Win32 hosts.
+# Currently only supports Windows hosts.
 func_file_conv ()
 {
   file=$1
@@ -99,7 +98,7 @@ func_at_file ()
 
 case $1 in
   '')
-     func_error "no command.  Try \`$0 --help' for more information."
+     func_error "no command.  Try '$0 --help' for more information."
      ;;
   -h | --h*)
     cat <<EOF
@@ -166,6 +165,7 @@ do
     r*) replace=yes ;;
     c*) create=yes  ;;
     u*)             ;; # TODO: don't ignore the update modifier
+    v*)             ;; # TODO: don't ignore the verbose modifier
     *)
       func_error "unknown action specified"
       ;;
diff --git a/lib/compile b/lib/compile
index bac481c..b1f4749 100755
--- a/lib/compile
+++ b/lib/compile
@@ -1,10 +1,10 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2010-11-15.09; # UTC
+scriptversion=2012-01-04.17; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <address@hidden>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -40,7 +40,7 @@ file_conv=
 
 # func_file_conv build_file lazy
 # Convert a $build file to $host form and store it in $file
-# Currently only supports Win32 hosts. If the determined conversion
+# Currently only supports Windows hosts. If the determined conversion
 # type is listed in (the comma separated) LAZY, no conversion will
 # take place.
 func_file_conv ()
@@ -94,7 +94,7 @@ func_cl_wrapper ()
     else
       case $1 in
        -o)
-         # configure might choose to run compile as `compile cc -o foo foo.c'.
+         # configure might choose to run compile as 'compile cc -o foo foo.c'.
          eat=1
          case $2 in
            *.o | *.[oO][bB][jJ])
@@ -196,19 +196,19 @@ eat=
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <address@hidden>.
 EOF
@@ -233,8 +233,8 @@ do
   else
     case $1 in
       -o)
-       # configure might choose to run compile as `compile cc -o foo foo.c'.
-       # So we strip `-o arg' only if arg is an object.
+       # configure might choose to run compile as 'compile cc -o foo foo.c'.
+       # So we strip '-o arg' only if arg is an object.
        eat=1
        case $2 in
          *.o | *.obj)
@@ -261,10 +261,10 @@ do
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
+  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
+  # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -273,7 +273,7 @@ fi
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
diff --git a/tests/specflg7.test b/tests/specflg7.test
index 067a36d..e41b316 100755
--- a/tests/specflg7.test
+++ b/tests/specflg7.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2012 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
@@ -59,5 +59,6 @@ $AUTOMAKE -a
 $MAKE
 ./true | grep true
 ./false | grep false
-test -f ./t-false.o
-test -f ./f-false.o
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+test -f ./t-false.$objext
+test -f ./f-false.$objext
diff --git a/tests/specflg8.test b/tests/specflg8.test
index 79daa15..c5a30d7 100755
--- a/tests/specflg8.test
+++ b/tests/specflg8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2011, 2012 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
@@ -59,7 +59,8 @@ $MAKE
 ./true
 ./false && Exit 1
 
-test -f ./true-true.o
-test -f ./true-true.o
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+test -f ./true-true.$objext
+test -f ./false-true.$objext
 
 :
diff --git a/tests/substref.test b/tests/substref.test
index 23dc168..6bbe8b1 100755
--- a/tests/substref.test
+++ b/tests/substref.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2010, 2011, 2012 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
@@ -56,7 +56,8 @@ $AUTOMAKE -a
 
 ./configure
 
-echo dlmain.c dlmain.o >exp
+objext=`sed -n -e 's/^OBJEXT = //p' < Makefile`
+echo dlmain.c dlmain.$objext >exp
 $MAKE got
 cat got
 diff exp got
diff --git a/tests/suffix8.test b/tests/suffix8.test
index d2ba0d4..4110056 100755
--- a/tests/suffix8.test
+++ b/tests/suffix8.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2003, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2010, 2012 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
@@ -41,6 +41,9 @@ libfoo_la_SOURCES = bar.x_
 .y_.o:
        cp $< $@
 
+.y_.obj:
+       cp $< $@
+
 .y_.z_:
        cp $< $@
 


hooks/post-receive
-- 
GNU Automake