--- ChangeLog.01 | 4 ++-- ChangeLog.02 | 4 ++-- ChangeLog.04 | 2 +- ChangeLog.11 | 4 ++-- ChangeLog.96 | 16 ++++++++-------- ChangeLog.98 | 24 ++++++++++++------------ contrib/README | 3 +-- doc/automake.texi | 2 +- lib/tap-driver.pl | 2 +- tests/add-missing.tap | 4 ++-- tests/cond6.test | 2 +- tests/parallel-tests-extra-programs.test | 2 +- tests/python5.test | 2 +- tests/tap-fancy2.test | 2 +- 14 files changed, 36 insertions(+), 37 deletions(-)
diff --git a/ChangeLog.01 b/ChangeLog.01 index d3150b2..2bd9d47 100644 --- a/ChangeLog.01 +++ b/ChangeLog.01 @@ -1436,7 +1436,7 @@ * m4/auxdir.m4: More comments. 2001-07-31 Richard Boulton <rich...@tartarus.org> - Raja R Harinath <harin...@cs.umn.edu> + Raja R Harinath <harin...@cs.umn.edu> * automake.in (variable_conditions_sub): Remove @parent_conds argument. This was old logic - duplicate or impossible @@ -1634,7 +1634,7 @@ * lib/am/tags.am (GTAGS): Added GTAGS_ARGS. From Shigio Yamaguchi. 2001-07-19 Tom Tromey <tro...@redhat.com> - Alexandre Duret-Lutz <dure...@epita.fr> + Alexandre Duret-Lutz <dure...@epita.fr> Fix for ccnoco.test, subobj8.test: * m4/Makefile.am (m4data_DATA): Added auxdir.m4. diff --git a/ChangeLog.02 b/ChangeLog.02 index 7e5caa7..45a7c67 100644 --- a/ChangeLog.02 +++ b/ChangeLog.02 @@ -2238,7 +2238,7 @@ Reported by Braden N. McDaniel. 2002-05-08 Charles Wilson <cwil...@ece.gatech.edu> - Alexandre Duret-Lutz <dure...@epita.fr> + Alexandre Duret-Lutz <dure...@epita.fr> * lib/am/progs.am (clean-%DIR%PROGRAMS): If Libtool is used, clean both `program$(EXEEXT)' and `program'; needed under Cygwin. @@ -3146,7 +3146,7 @@ 2002-01-06 Raja R Harinath <harin...@cs.umn.edu> * automake.in (handle_languages): Emit an automake - internal variable 'am__depfiles_maybe'. + internal variable 'am__depfiles_maybe'. * lib/am/configure.am (%MAKEFILE%): Use am__depfiles_maybe. * lib/am/configure.am (%MAKEFILE%): Pass `depfiles' to diff --git a/ChangeLog.04 b/ChangeLog.04 index 5dfcd9e..ee393ca 100644 --- a/ChangeLog.04 +++ b/ChangeLog.04 @@ -1549,7 +1549,7 @@ (generate_makefile): Likewise. * tests/nodist3.test: Ensure that DIST_SOURCES is not created, and that dist target does not exist. - Reported by Tom Fitzsimmons. + Reported by Tom Fitzsimmons. 2004-01-02 Alexandre Duret-Lutz <a...@gnu.org> diff --git a/ChangeLog.11 b/ChangeLog.11 index 50b37ec..9c2af31 100644 --- a/ChangeLog.11 +++ b/ChangeLog.11 @@ -415,7 +415,7 @@ (posixsubst-ltlibraries.log): Likewise. * tests/defs: Adjust the path of the included `get.sh' scripts generated by `libtool-macros.test' and `gettext-macros.test'. - * aclocal.m4: Delete, it's auto-generated now. + * aclocal.m4: Delete, it's auto-generated now. * configure: Likewise. * Makefile.in: Likewise. * doc/Makefile.in: Likewise. @@ -7109,7 +7109,7 @@ * tests/yflags.test: Likewise. * tests/yflags-force-conditional.test: Likewise. * tests/lflags2.test: Simplify so that it doesn't require a - C++ compiler anymore. + C++ compiler anymore. * tests/yflags2.test: Likewise. * tests/autohdrdry.test (configure.in): Remove unneeded call to `AC_PROG_CC'. diff --git a/ChangeLog.96 b/ChangeLog.96 index 07f71c2..c721146 100644 --- a/ChangeLog.96 +++ b/ChangeLog.96 @@ -172,7 +172,7 @@ Tue Dec 3 11:29:01 1996 Gordon Matzigkeit <g...@gnu.ai.mit.edu> * compile-kr.am: Quote arguments to echo. * progs.am: Fix up problems when LIBTOOL is not defined (by - setting shell variable instprog to the installation program). + setting shell variable instprog to the installation program). * aclocal.in (scan_file): Allow the acinclude.m4 file to override any other macro files (but still prevent multiple definitions @@ -194,7 +194,7 @@ Tue Dec 3 10:40:48 1996 Tom Tromey <tro...@cygnus.com> Mon Dec 2 13:51:11 1996 Gordon Matzigkeit <g...@gnu.ai.mit.edu> * automake.in (get_object_extension): Unshift ansi2knr onto the - all target, so that it builds before any other targets. + all target, so that it builds before any other targets. [de_ansi_objects]: Delete, since unshifting ansi2knr is an easier solution. @@ -306,7 +306,7 @@ Fri Nov 15 18:58:04 1996 Tom Tromey <tro...@cygnus.com> * tags.am (tags-recursive): Removed. (TAGS): Depend on @DIRS@, @CONFIG@. Use @CONFIG@ in rule. (ID): From tags-subd.am. - + * aclocal.in (obsolete_macros): Include AM_FUNC_FNMATCH. * automake.in (scan_configure): Recognize AC_FUNC_FNMATCH. * m4/fnmatch.m4: Removed (now in autoconf). @@ -1311,7 +1311,7 @@ Tue Jun 18 10:53:54 1996 Tom Tromey <tro...@creche.cygnus.com> * automake.in (handle_tests): Don't directly generate site.exp. Sun Jun 16 22:21:16 1996 Harlan Stenn <har...@brown.pfcs.com> - + * automake.in: Treat an initial `#' on a word in AUTOMAKE_OPTIONS as a comment start. Add support for a dist-tarZ target. @@ -1572,8 +1572,8 @@ Thu Apr 25 18:40:06 1996 Tom Tromey <tro...@creche.cygnus.com> Tue Apr 23 17:57:13 1996 Andreas Schwab <sch...@issan.informatik.uni-dortmund.de> * doc/mdate-sh: Extract the last field from the date output, not - the sixth, which will fail when the timezone name has more than - one word or is missing. + the sixth, which will fail when the timezone name has more than + one word or is missing. Wed Apr 24 20:29:26 1996 Tom Tromey <tro...@creche.cygnus.com> @@ -2125,9 +2125,9 @@ Wed Feb 7 18:00:29 1996 Tom Tromey <tro...@creche.cygnus.com> Give error if appropriate install macro not seen. (handle_subdirs): Ensure $seen_gettext before requiring gettext-specific files. - (handle_configure): Automatically rebuild + (handle_configure): Automatically rebuild - From Jim Meyering: + From Jim Meyering: * automake.in (handle_source_transform): Use \W when quoting regexp. When blah_SOURCES not explicitly defined, still create entry in %deps. diff --git a/ChangeLog.98 b/ChangeLog.98 index 1fcc56c..717b7f5 100644 --- a/ChangeLog.98 +++ b/ChangeLog.98 @@ -122,7 +122,7 @@ Fri Dec 11 10:23:17 1998 Matthew D. Langston <langs...@slac.stanford.edu> 1998-12-20 Thomas Tanner <tan...@gmx.de> * automake.in (handle_libraries, handle_ltlibraries): relax the - name checking to not enforce `^lib.*' for the sake of building libtool + name checking to not enforce `^lib.*' for the sake of building libtool modules. 1998-12-21 Tom Tromey <tro...@cygnus.com> @@ -301,7 +301,7 @@ Thu Oct 8 15:00:57 1998 Matthew D. Langston <langs...@slac.stanford.edu> * automake.in: Registered the ppf77 language (`.F' extension) for preprocessed Fortran 77. - + * automake.in: Registered the ratfor language (`.r' extension). * automake.in: Registered Fortran 77 header files with the "header @@ -525,7 +525,7 @@ Tue Sep 29 00:10:22 1998 Tom Tromey <tro...@cygnus.com> * automake.in: New pattern: INCLUDE_PATTERN. (read_am_file): Make AM_FILE a local filehandle. - For INCLUDE_PATTERN, store included paths on @include_stack and call + For INCLUDE_PATTERN, store included paths on @include_stack and call read_am_file with argument. (handle_configure): When printing the dependencies for Makefile.in, print the items on include_stack (if any) as @@ -533,7 +533,7 @@ Tue Sep 29 00:10:22 1998 Tom Tromey <tro...@cygnus.com> * automake.texi: Make a command index `cm' that goes into the concept index. Put if, endif, else, and include in the command index. - (Include): Show usage of include directive. + (Include): Show usage of include directive. Mon Sep 28 00:03:45 1998 Tom Tromey <tro...@cygnus.com> @@ -663,8 +663,8 @@ Mon Sep 14 00:55:12 1998 Per Cederqvist <ce...@lysator.liu.se> Fix for Dynix 3.1.1. * automake.in (handle_yacc_lex_cxx): Transform "# " to "#line"; - some compilers (such as /bin/cc on Dynix 3.1.1) don't accept the - output from the preprocessor. + some compilers (such as /bin/cc on Dynix 3.1.1) don't accept the + output from the preprocessor. Tue Aug 25 18:40:51 1998 Tom Tromey <tro...@cygnus.com> @@ -744,7 +744,7 @@ Fri Jul 17 07:37:20 1998 H.J. Lu (h...@gnu.org) Fri Jul 17 11:58:27 1998 Ian Lance Taylor <i...@cygnus.com> * automake.in: Use $(AM_MAKEFLAGS) in every invocation of $(MAKE). - * subdirs.am: Likewise. + * subdirs.am: Likewise. Thu Jul 16 18:09:03 1998 Ian Lance Taylor <i...@cygnus.com> @@ -825,7 +825,7 @@ Sun Apr 5 13:58:24 1998 Tom Tromey <tro...@cygnus.com> * Released 1.3. * automake.in (handle_options): Correctly handle trailing alpha - version letter or lack thereof. Test version3.test. + version letter or lack thereof. Test version3.test. * automake.in (am_conf_line_warning): Perl 4 fixlet; typo fix. @@ -846,7 +846,7 @@ Fri Apr 3 15:43:46 1998 Doug Evans <dev...@seba.cygnus.com> * automake.in (handle_configure): Fix setting of colon_infile in case where multiple files are used to build Makefile. [ Test colon5.test ] - + Fri Apr 3 13:07:58 1998 Tom Tromey <tro...@cygnus.com> * ansi2knr.c, texinfo.tex: New versions from respective @@ -1424,7 +1424,7 @@ Tue Aug 5 14:44:10 1997 Ian Lance Taylor <i...@cygnus.com> Mon Aug 4 14:52:08 1997 Ian Lance Taylor <i...@cygnus.com> * automake.in ($RULE_PATTERN): Accept $ in body of rule name. - (handle_programs): Don't append $(EXEEXT) if the + (handle_programs): Don't append $(EXEEXT) if the program name contains '.'. (am_install_var): When rewriting _PROGRAMS, don't append $(EXEEXT) if the program names contains '.'. Also, handle conditionals. @@ -1529,7 +1529,7 @@ Sat Feb 22 16:05:24 1997 Gordon Matzigkeit <g...@gnu.ai.mit.edu> need compile-kr.am. Delete it. * automake.in (handle_yacc_lex_cxx, get_object_extension): Use - _.c, _.o, _.lo instead of ._c, ._o, .l_o for de-ansification. + _.c, _.o, _.lo instead of ._c, ._o, .l_o for de-ansification. * ansi2knr.c (main): Parse our arguments a little differently so that we don't create null output files when we can't read the @@ -2058,7 +2058,7 @@ Wed Feb 26 08:41:11 1997 Gordon Matzigkeit <g...@gnu.ai.mit.edu> to do to upgrade the support. * automake.in, ltlib-clean.am, ltlib.am, ltlibrary.am: Revamped - libtool support to use the _LTLIBRARIES primary. + libtool support to use the _LTLIBRARIES primary. Wed Feb 26 00:20:39 1997 Tom Tromey <tro...@cygnus.com> diff --git a/contrib/README b/contrib/README index bbef72f..a4d7eeb 100644 --- a/contrib/README +++ b/contrib/README @@ -14,7 +14,7 @@ There are several reasons for which a feature can be kept in contrib: core (as doing so too early would later force us to continue the support for backward-compatibility, even if the features proves flawed or fails to attract widespread use). - + 2. The APIs or overall design of the feature are still unstable, and need on-field testing to iron warts and usability bugs, or uncover potential flaws. @@ -24,4 +24,3 @@ There are several reasons for which a feature can be kept in contrib: remove it from the Automake core, but cannot remove it altogether, for the sake of those still-existing usage. So it gets moved in contrib. - diff --git a/doc/automake.texi b/doc/automake.texi index 64ed7ec..a0ac380 100644 --- a/doc/automake.texi +++ b/doc/automake.texi @@ -8979,7 +8979,7 @@ The parallel (or concurrent) test harness is enabled by the Automake option scripts output in @file{.log} files, concurrent execution of tests with @code{make -j}, specification of inter-test dependencies, lazy reruns of tests that have not completed in a prior run, and hard errors for exceptional -failures. +failures. This harness is still somewhat experimental and may undergo changes in order to satisfy additional portability requirements. diff --git a/lib/tap-driver.pl b/lib/tap-driver.pl index 9ce1a31..ecc2c0c 100755 --- a/lib/tap-driver.pl +++ b/lib/tap-driver.pl @@ -394,7 +394,7 @@ sub handle_tap_result ($) my $test_result = stringify_result_obj $result_obj; my $string = $result_obj->number; - + my $description = $result_obj->description; $string .= " $description" unless is_null_string $description; diff --git a/tests/add-missing.tap b/tests/add-missing.tap index 4f5d682..49dc8bb 100755 --- a/tests/add-missing.tap +++ b/tests/add-missing.tap @@ -166,7 +166,7 @@ check_ () # not told to install them, it should complain and error out, # and also give a useful suggestion. AUTOMAKE_fails -d "$pfx missing files, automake fails" - for f in $files; do + for f in $files; do command_ok_ \ "$pfx warn about missing file $f" \ grep "required file ['\`]$build_aux/$f' not found" stderr @@ -189,7 +189,7 @@ check_ () test -f $build_aux/$f done # Automake should inform about which files it's installing. - for f in $files; do + for f in $files; do command_ok_ \ "$pfx report installation of $f" \ grep ": installing ['\`]$build_aux/$f'$" stderr diff --git a/tests/cond6.test b/tests/cond6.test index 60436ab..0ac1783 100755 --- a/tests/cond6.test +++ b/tests/cond6.test @@ -64,7 +64,7 @@ cat stdout grep '^BEG: a b c d e f g h :END$' stdout $MAKE install -for x in a b c d e f g h; do +for x in a b c d e f g h; do test -f _inst/Help/$x done diff --git a/tests/parallel-tests-extra-programs.test b/tests/parallel-tests-extra-programs.test index 51d6ef3..aa99cb3 100755 --- a/tests/parallel-tests-extra-programs.test +++ b/tests/parallel-tests-extra-programs.test @@ -30,7 +30,7 @@ END cat > Makefile.am << 'END' TEST_EXTENSIONS = .bin .test EXTRA_PROGRAMS = -TESTS = +TESTS = END # diff --git a/tests/python5.test b/tests/python5.test index 8acbdfe..c67d92b 100755 --- a/tests/python5.test +++ b/tests/python5.test @@ -32,7 +32,7 @@ $ACLOCAL $AUTOCONF $AUTOMAKE --add-missing -./configure >stdout 2>stderr && { +./configure >stdout 2>stderr && { cat stdout cat stderr >&2 Exit 1 diff --git a/tests/tap-fancy2.test b/tests/tap-fancy2.test index b661146..8080861 100755 --- a/tests/tap-fancy2.test +++ b/tests/tap-fancy2.test @@ -113,7 +113,7 @@ total=`expr $pass + $fail + $xfail + $xpass + $skip` # Even nastier! But accordingly to the specifics, it should still work. for result in 'ok' 'not ok'; do - echo "${result}{[(<#${tab}TODO>)]}" >> all.test + echo "${result}{[(<#${tab}TODO>)]}" >> all.test done echo "ok{[(<#${tab}SKIP>)]}" >> all.test -- 1.7.7.3