From 76d8a53ec09af4a05b64fd220a4cc1d5c4bdb1b5 Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 25 Jun 2010 17:19:44 +0200 Subject: [PATCH] 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 --- ChangeLog | 14 ++++++++++++++ tests/lex3.test | 5 ++--- tests/lex5.test | 2 +- tests/multlib.test | 6 +++--- tests/pr279-2.test | 4 +--- tests/pr279.test | 4 +--- tests/specflg3.test | 4 ++-- tests/subobj10.test | 4 ++-- tests/subobj9.test | 4 ++-- tests/target-cflags.test | 5 +++-- 10 files changed, 31 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7aa547f2..4b0d3c482 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2010-06-26 Stefano Lattarini + 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 59146c7af..178a54fd0 100755 --- 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 1a703e271..88924b214 100755 --- 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 65b3fd490..5ff19d71b 100755 --- 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 1d1e675e7..286e33a51 100755 --- 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 b7ec641ed..50dff53e5 100755 --- 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 53793a10b..60006a5c7 100755 --- 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 c9c129d52..a589e457b 100755 --- 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 99fe6e84f..2b331e024 100755 --- 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 d0f83f3bf..b324568d9 100755 --- 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 -- 2.47.2