[Automake-commit] [SCM] GNU Automake branch, branch-1.11, updated. v1.11.1-120-g16650dc

[Ralf Wildenhues]

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=16650dcc86bb0b0e4ab711c1e9d91a2088362db9

The branch, branch-1.11 has been updated
       via  16650dcc86bb0b0e4ab711c1e9d91a2088362db9 (commit)
       via  f5976391875f8ff34aabbafa55f8e1ee06e9f53f (commit)
       via  0748837f0c719afd6ede870675ab9efa9926fd27 (commit)
      from  8d0b99dd1cfdad4bd2cbc211557b8e64f1ad293f (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 16650dcc86bb0b0e4ab711c1e9d91a2088362db9
Merge: 8d0b99dd1cfdad4bd2cbc211557b8e64f1ad293f 
f5976391875f8ff34aabbafa55f8e1ee06e9f53f
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Jun 13 19:22:18 2010 +0200

    Merge branch 'maint' into branch-1.11

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

Summary of changes:
 ChangeLog           |   10 ++++++++++
 tests/Makefile.am   |   22 +++++++++++-----------
 tests/Makefile.in   |   20 ++++++++++----------
 tests/obsolete.test |    5 ++++-
 4 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ce8aa65..4dec7e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-06-13  Stefano Lattarini  <address@hidden>
+
+       Add useful comment in test script obsolete.test.
+       * tests/obsolte.test: Add a comment explaining why we need
+       an indirection in adding $AUTOUPDATE to $required.
+
+       Normalize whitespaces in 'tests/Makefile.am'.
+       * tests/Makefile.am (TESTS): Use only spaces, not tabs, in the
+       definition of this variable.
+
 2010-06-12  Ralf Wildenhues  <address@hidden>
 
        Remove a couple of unneeded conditionals from tests.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 70058a1..b61e71b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -36,7 +36,7 @@ $(parallel_tests): $(parallel_tests:-p.test=.test) Makefile.am
 
 MAINTAINERCLEANFILES = $(parallel_tests)
 
-TESTS =        \
+TESTS = \
 aclibobj.test \
 aclocal.test \
 aclocal3.test \
@@ -316,7 +316,7 @@ flibs.test \
 fn99.test \
 fn99subdir.test \
 fnoc.test \
-fo.test        \
+fo.test \
 forcemiss.test \
 forcemiss2.test \
 fort1.test \
@@ -422,12 +422,12 @@ libtoo10.test \
 libtoo11.test \
 license.test \
 license2.test \
-link_c_cxx.test        \
+link_c_cxx.test \
 link_dist.test \
 link_f90_only.test \
 link_fc.test \
 link_fccxx.test \
-link_fcxx.test \
+link_fcxx.test \
 link_f_only.test \
 lisp2.test \
 lisp3.test \
@@ -622,13 +622,13 @@ srcsub.test \
 srcsub2.test \
 space.test \
 specflg.test \
-specflg2.test  \
-specflg3.test  \
-specflg6.test  \
-specflg7.test  \
-specflg8.test  \
-specflg9.test  \
-specflg10.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
+specflg10.test \
 spell.test \
 spell2.test \
 spell3.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index be656fa..685bddd 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -554,7 +554,7 @@ flibs.test \
 fn99.test \
 fn99subdir.test \
 fnoc.test \
-fo.test        \
+fo.test \
 forcemiss.test \
 forcemiss2.test \
 fort1.test \
@@ -660,12 +660,12 @@ libtoo10.test \
 libtoo11.test \
 license.test \
 license2.test \
-link_c_cxx.test        \
+link_c_cxx.test \
 link_dist.test \
 link_f90_only.test \
 link_fc.test \
 link_fccxx.test \
-link_fcxx.test \
+link_fcxx.test \
 link_f_only.test \
 lisp2.test \
 lisp3.test \
@@ -860,13 +860,13 @@ srcsub.test \
 srcsub2.test \
 space.test \
 specflg.test \
-specflg2.test  \
-specflg3.test  \
-specflg6.test  \
-specflg7.test  \
-specflg8.test  \
-specflg9.test  \
-specflg10.test \
+specflg2.test \
+specflg3.test \
+specflg6.test \
+specflg7.test \
+specflg8.test \
+specflg9.test \
+specflg10.test \
 spell.test \
 spell2.test \
 spell3.test \
diff --git a/tests/obsolete.test b/tests/obsolete.test
index e6601c9..337e4db 100755
--- a/tests/obsolete.test
+++ b/tests/obsolete.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1996, 2001, 2002, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 1996, 2001, 2002, 2007, 2008, 2010 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
@@ -16,6 +17,8 @@
 
 # Test to make sure obsolete macros can be autoupdated.
 
+# We need the following indirection in case someone exported e.g.
+# AUTOUPDATE='autoupdate --verbose'.
 set x ${AUTOUPDATE-autoupdate}
 required=$2
 . ./defs || Exit 1


hooks/post-receive
-- 
GNU Automake