Tests: remove useless repetitions of `foreign' automake option.

* tests/multlib.test (configure.in): Remove useless use of
`foreign' option in AM_INIT_AUTOMAKE (the `--foreign' option is
already in $AUTOMAKE by default, so no point in repeating it).
* tests/subobj10.test: Likewise.
* tests/subobj9.test: Likewise.
* tests/lex3.test (Makefile.am): Similarly, remove useless use
of `foreign' option in AUTOMAKE_OPTIONS.
* tests/lex5.test: Likewise.
* tests/pr279.test: Likewise.
* tests/pr279-2.test: Likewise.
* tests/specflg3.test: Likewise.
* tests/target-cflags.test: Likewise.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index a7aa547f28380060c767a1154736d977568f271c..4b0d3c48210caa673ce857d35ee5c986df129cf9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2010-06-26  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
+       Tests: remove useless repetitions of `foreign' automake option.
+       * tests/multlib.test (configure.in): Remove useless use of
+       `foreign' option in AM_INIT_AUTOMAKE (the `--foreign' option is
+       already in $AUTOMAKE by default, so no point in repeating it).
+       * tests/subobj10.test: Likewise.
+       * tests/subobj9.test: Likewise.
+       * tests/lex3.test (Makefile.am): Similarly, remove useless use
+       of `foreign' option in AUTOMAKE_OPTIONS.
+       * tests/lex5.test: Likewise.
+       * tests/pr279.test: Likewise.
+       * tests/pr279-2.test: Likewise.
+       * tests/specflg3.test: Likewise.
+       * tests/target-cflags.test: Likewise.
+
        Drop useless requirement "gzip" in lex5.test.
        * tests/lex5.test ($required): Do not list "gzip", as it's
        never used.

diff --git a/tests/lex3.test b/tests/lex3.test
index 59146c7af129945e537389141ea79ceeda877d33..178a54fd054db66c887b0137b4924e226545d2cd 100755 (executable)
--- a/tests/lex3.test
+++ b/tests/lex3.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 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
@@ -38,9 +39,7 @@ AC_OUTPUT(Makefile)
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS  = foreign
 LDADD             = @LEXLIB@
-
 noinst_PROGRAMS   = foo
 foo_SOURCES       = foo.l
 END

diff --git a/tests/lex5.test b/tests/lex5.test
index 1a703e271124bd7eb3b5e42670309e191bbc1abe..88924b2149ce4dc144654d642431bca10b806d55 100755 (executable)
--- a/tests/lex5.test
+++ b/tests/lex5.test
@@ -33,7 +33,7 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS  = foreign subdir-objects
+AUTOMAKE_OPTIONS  = subdir-objects
 LDADD             = @LEXLIB@
 
 bin_PROGRAMS    = foo/foo

diff --git a/tests/multlib.test b/tests/multlib.test
index 65b3fd4907af75edd9e026f7527e0a3697bc89da..5ff19d71b742e8034103ebe6a84acf40290636a9 100755 (executable)
--- a/tests/multlib.test
+++ b/tests/multlib.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003, 2004, 2007  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2007, 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
@@ -64,7 +64,7 @@ AC_CONFIG_SRCDIR(foo.c)
 # Apparently it doesn't work to have auxdir=.. when
 # multilib uses symlinked trees.
 AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(foreign)
+AM_INIT_AUTOMAKE
 AC_PROG_CC
 AC_PROG_RANLIB
 AM_ENABLE_MULTILIB(Makefile,[..])
@@ -87,7 +87,7 @@ AC_INIT(libbar, 0.1, nobody@localhost)
 # Apparently it doesn't work to have auxdir=.. when
 # multilib uses symlinked trees.
 AC_CONFIG_AUX_DIR(.)
-AM_INIT_AUTOMAKE(foreign)
+AM_INIT_AUTOMAKE
 AC_PROG_CC
 AC_PROG_RANLIB
 AM_ENABLE_MULTILIB(Makefile,[..])

diff --git a/tests/pr279-2.test b/tests/pr279-2.test
index 1d1e675e780c6fb0a33ac9119c94cfe2f4861a37..286e33a51ca3dffe0289aa789137e49177bc1c2f 100755 (executable)
--- a/tests/pr279-2.test
+++ b/tests/pr279-2.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -28,8 +28,6 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
-
 if FOOTEST
 foo_LDADD = zardoz
 else

diff --git a/tests/pr279.test b/tests/pr279.test
index b7ec641ed7e45018f31b614c9cd48108387c886e..50dff53e52f4063a1c7dacdf5cfe3cb8411e28f8 100755 (executable)
--- a/tests/pr279.test
+++ b/tests/pr279.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 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
@@ -28,8 +28,6 @@ AC_OUTPUT
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
-
 if FOOTEST
 xtralib =
 else

diff --git a/tests/specflg3.test b/tests/specflg3.test
index 53793a10b73efacf958ef426919101872a8c28ab..60006a5c72a927f76f98ed97612b41c334596cac 100755 (executable)
--- a/tests/specflg3.test
+++ b/tests/specflg3.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2004, 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
@@ -27,7 +28,6 @@ AC_OUTPUT(Makefile)
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign
 bin_PROGRAMS = foo
 foo_SOURCES = foo.c
 foo_CFLAGS = -DFOO

diff --git a/tests/subobj10.test b/tests/subobj10.test
index c9c129d52ea0afbf7c7bc4b17753aa149293fe3a..a589e457bfb4e595187d625a79d573127b4c2412 100755 (executable)
--- a/tests/subobj10.test
+++ b/tests/subobj10.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# Copyright (C) 2006, 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
@@ -23,7 +23,7 @@ set -e
 
 cat > configure.in << 'END'
 AC_INIT(x, 0, x)
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([subdir-objects])
 
 AM_PROG_AS
 AC_PROG_RANLIB

diff --git a/tests/subobj9.test b/tests/subobj9.test
index 99fe6e84f2ee67ac996831a2a060be83b1288a1a..2b331e024565c1f528c231488e735b8920ebcb74 100755 (executable)
--- a/tests/subobj9.test
+++ b/tests/subobj9.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2002, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2004, 2005, 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
@@ -21,7 +21,7 @@ required='libtoolize g++'
 
 cat > configure.in << 'END'
 AC_INIT(x, 0, x)
-AM_INIT_AUTOMAKE([foreign subdir-objects])
+AM_INIT_AUTOMAKE([subdir-objects])
 
 AC_PROG_CXX
 AM_PROG_LIBTOOL

diff --git a/tests/target-cflags.test b/tests/target-cflags.test
index d0f83f3bf8281c897e6ff8625d94b907eebc02cf..b324568d9275a4740b0004ee41b505b7cdc4b284 100755 (executable)
--- a/tests/target-cflags.test
+++ b/tests/target-cflags.test
@@ -1,5 +1,6 @@
 #! /bin/sh
-# Copyright (C) 2000, 2001, 2002, 2004  Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2004, 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
@@ -29,7 +30,7 @@ AC_OUTPUT(Makefile)
 END
 
 cat > Makefile.am << 'END'
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = no-dependencies
 
 bin_PROGRAMS = foo bar
 foo_CFLAGS   = -DFOO