* Makefile.in: Rebuild with automake 1.11.1.

	* aclocal.m4: Likewise.
	* testsuite/Makefile.in: Likewise.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 83eef92a373a05d103b6ea042cea7478663ba891..97a0b885703fb48cf12f5431f22613ca6b47a81a 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-19  Ian Lance Taylor  <iant@google.com>
+
+       * Makefile.in: Rebuild with automake 1.11.1.
+       * aclocal.m4: Likewise.
+       * testsuite/Makefile.in: Likewise.
+
 2010-08-19  Ian Lance Taylor  <iant@google.com>
 
        PR 10893

diff --git a/gold/Makefile.in b/gold/Makefile.in
index fdc9dab5d056aee9a80d3c973048e047ceacadcd..bf729cf85ca2a3f23adf6cf2c1661bcf21dfafde 100644 (file)
--- a/gold/Makefile.in
+++ b/gold/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -716,7 +716,7 @@ distclean-compile:
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
 $(RECURSIVE_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -741,7 +741,7 @@ $(RECURSIVE_TARGETS):
        fi; test -z "$$fail"
 
 $(RECURSIVE_CLEAN_TARGETS):
-       @failcom='exit 1'; \
+       @fail= failcom='exit 1'; \
        for f in x $$MAKEFLAGS; do \
          case $$f in \
            *=* | --[!k]*);; \
@@ -956,10 +956,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 check-TESTS:
        @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-       @set_logs=; if test "X$(TEST_LOGS)" = X.log; then               \
-         set_logs=TEST_LOGS=;                                          \
-       fi;                                                             \
-       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+       @list='$(TEST_LOGS)';                                           \
+       list=`for f in $$list; do                                       \
+         test .log = $$f || echo $$f;                                  \
+       done | tr '\012\015' '  '`;                                     \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 .log.html:
        @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';            \

diff --git a/gold/aclocal.m4 b/gold/aclocal.m4
index db4865281856379e5b93d850aae9d2b09a252776..ded4d601b9eaa217cc922bf1efd36a1378c94335 100644 (file)
--- a/gold/aclocal.m4
+++ b/gold/aclocal.m4
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.11 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 # 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
@@ -34,7 +34,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11], [],
+m4_if([$1], [1.11.1], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -50,7 +50,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11])dnl
+[AM_AUTOMAKE_VERSION([1.11.1])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

diff --git a/gold/testsuite/Makefile.in b/gold/testsuite/Makefile.in
index f96942f83035484142bd0b984d04e4164236b4b4..fdb50dccc51229949638ac408b4f1de6639e5d93 100644 (file)
--- a/gold/testsuite/Makefile.in
+++ b/gold/testsuite/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -3129,10 +3129,11 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 check-TESTS:
        @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list
        @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG)
-       @set_logs=; if test "X$(TEST_LOGS)" = X.log; then               \
-         set_logs=TEST_LOGS=;                                          \
-       fi;                                                             \
-       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) $$set_logs
+       @list='$(TEST_LOGS)';                                           \
+       list=`for f in $$list; do                                       \
+         test .log = $$f || echo $$f;                                  \
+       done | tr '\012\015' '  '`;                                     \
+       $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$list"
 
 .log.html:
        @list='$(RST2HTML) $$RST2HTML rst2html rst2html.py';            \