From 1b39292897b2adedfb4b1b0046a21d38a9b11173 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Thu, 23 Mar 2006 06:35:15 +0000 Subject: [PATCH] * automake.in (libtool_new_api): Fix a typo in the comment. * lib/Automake/Makefile.am (Config.pm): Likewise. * lib/am/depend2.am: Likewise. * tests/xsource.test: With `set -e', `|| exit 1' is no longer needed. --- ChangeLog | 10 ++- automake.in | 2 +- doc/stamp-vti | 2 +- doc/version.texi | 2 +- lib/Automake/Makefile.am | 2 +- lib/am/depend2.am | 2 +- tests/Makefile.in | 175 ++++++++++++++++++++++++----------------------- tests/xsource.test | 2 +- 8 files changed, 103 insertions(+), 94 deletions(-) diff --git a/ChangeLog b/ChangeLog index db53266..149926a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-03-23 Stepan Kasal + + * automake.in (libtool_new_api): Fix a typo in the comment. + * lib/Automake/Makefile.am (Config.pm): Likewise. + * lib/am/depend2.am: Likewise. + * tests/xsource.test: With `set -e', `|| exit 1' is no longer + needed. + 2006-03-23 Ralf Wildenhues * tests/depcomp6.test, tests/depcomp7.test: Change back to @@ -159,7 +167,7 @@ 2006-01-05 Stepan Kasal Alexandre Duret-Lutz - * automake.in (top_srcdir): New global. + * automake.in (topsrcdir): New global. (generate_makefile): Compute it. (fill_dist_dirs): New function extracted from handle_dist. (handle_dist, handle_configure): Use fill_dist_dirs. diff --git a/automake.in b/automake.in index 3158063..69ad484 100755 --- a/automake.in +++ b/automake.in @@ -353,7 +353,7 @@ my $ac_gettext_location; # Lists of tags supported by Libtool. my %libtool_tags = (); # 1 if Libtool uses LT_SUPPORTED_TAG. If it does, then it also -# use AC_REQUIRE_AUX_FILE. +# uses AC_REQUIRE_AUX_FILE. my $libtool_new_api = 0; # Most important AC_CANONICAL_* macro seen so far. diff --git a/doc/stamp-vti b/doc/stamp-vti index c34e90a..172868c 100644 --- a/doc/stamp-vti +++ b/doc/stamp-vti @@ -1,4 +1,4 @@ -@set UPDATED 20 March 2006 +@set UPDATED 21 March 2006 @set UPDATED-MONTH March 2006 @set EDITION 1.9a @set VERSION 1.9a diff --git a/doc/version.texi b/doc/version.texi index c34e90a..172868c 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ -@set UPDATED 20 March 2006 +@set UPDATED 21 March 2006 @set UPDATED-MONTH March 2006 @set EDITION 1.9a @set VERSION 1.9a diff --git a/lib/Automake/Makefile.am b/lib/Automake/Makefile.am index 20a6e2b..1d67215 100644 --- a/lib/Automake/Makefile.am +++ b/lib/Automake/Makefile.am @@ -58,7 +58,7 @@ do_subst = in=`echo $@ | sed 's/\.[^.]*$$//'`; sed \ -e "s,[@]configure_input[@],Generated from $$in.in; do not edit by hand.,g" \ -e 's,[@]datadir[@],$(datadir),g' -## This file depend on Makefile so it is rebuilt if $(VERSION), +## This file depends on Makefile so it is rebuilt if $(VERSION), ## $(datadir) or other do_subst'ituted variables change. ## Use chmod a-w to prevent people from editing the wrong file by accident. Config.pm: Config.in Makefile diff --git a/lib/am/depend2.am b/lib/am/depend2.am index aca2e10..12a031d 100644 --- a/lib/am/depend2.am +++ b/lib/am/depend2.am @@ -38,7 +38,7 @@ ## Verbosity of FASTDEP rules ## -------------------------- -## (1) Some people want to see what happen during make. They think +## (1) Some people want to see what happens during make. They think ## @-commands are evil because hiding things hinders debugging. ## (2) Other people want to see only the important commands--those that ## may produce diagnostics, such as compiler invocations. They diff --git a/tests/Makefile.in b/tests/Makefile.in index 6c7a291..78cf559 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -74,93 +74,94 @@ TESTS = aclibobj.test aclocal.test aclocal3.test aclocal4.test \ depcomp4.test depcomp5.test depcomp6.test depcomp7.test \ depdist.test depend.test depend2.test depend3.test \ depend4.test destdir.test dirforbid.test dirlist.test \ - discover.test distcom2.test distcom3.test distcom4.test \ - distcom5.test distcom6.test distcom7.test distdir.test \ - distname.test dollar.test double.test dup2.test else.test \ - empty.test empty2.test empty3.test empty4.test exdir.test \ - exdir2.test exeext.test exeext2.test exeext3.test exeext4.test \ - exsource.test ext.test ext2.test extra.test extra3.test \ - extra4.test extra5.test extra6.test extra7.test f90only.test \ - flibs.test fn99.test fnoc.test fo.test fonly.test fortdep.test \ - fpinst2.test fpinstall.test gcj.test gcj2.test gcj3.test \ - gcj4.test gcj5.test getopt.test gettext.test gettext2.test \ - gnumake.test gnuwarn.test gnuwarn2.test gnits.test gnits2.test \ - gnits3.test header.test help.test hfs.test hosts.test \ - implicit.test include.test include2.test info.test insh2.test \ - install2.test installdir.test instsh.test instsh2.test \ - instdat.test instdat2.test instexec.test insthook.test \ - instman.test instman2.test instspc.test interp.test \ - interp2.test java.test java2.test java3.test javaprim.test \ - javasubst.test ldadd.test ldflags.test lex.test lex2.test \ - lex3.test lex4.test lex5.test libobj2.test libobj3.test \ - libobj4.test libobj5.test libobj7.test libobj8.test \ - libobj10.test libobj11.test libobj12.test libobj13.test \ - libobj14.test library.test library2.test library3.test \ - libtool.test libtool2.test libtool3.test libtool4.test \ - libtool5.test libtool6.test libtool7.test libtool8.test \ - libtool9.test license.test link_c_cxx.test link_dist.test \ - link_f90_only.test link_fc.test link_fccxx.test link_fcxx.test \ - link_f_only.test lisp2.test lisp3.test lisp4.test lisp5.test \ - lisp6.test lisp7.test lisp8.test listval.test location.test \ - longline.test longlin2.test ltcond.test ltcond2.test \ - ltconv.test ltdeps.test ltlibobjs.test ltlibsrc.test \ - maintclean.test make.test makej.test makevars.test man.test \ - man2.test mclean.test mdate.test mdate2.test mdate3.test \ - mdate4.test missing.test missing2.test missing3.test \ - mkinstall.test mkinst2.test mkinst3.test mmodely.test \ - multlib.test nobase.test nodef.test nodef2.test nodep.test \ - nodepcomp.test nodist.test nodist2.test nodist3.test \ - nogzip.test nogzip2.test noinst.test noinstdir.test \ - nolink.test nostdinc.test number.test objc.test objc2.test \ - obsolete.test order.test outdir.test output.test output2.test \ - output3.test output4.test output5.test output6.test \ - output7.test output8.test output9.test output10.test \ - output11.test output12.test overrid.test parse.test \ - percent.test percent2.test phony.test pluseq.test pluseq2.test \ - pluseq3.test pluseq4.test pluseq5.test pluseq6.test \ - pluseq7.test pluseq8.test pluseq9.test pluseq10.test \ - postproc.test ppf77.test pr2.test pr9.test pr72.test pr87.test \ - pr204.test pr211.test pr220.test pr224.test pr229.test \ - pr243.test pr266.test pr279.test pr279-2.test pr287.test \ - pr300-lib.test pr300-ltlib.test pr300-prog.test pr307.test \ - pr401.test pr401b.test pr401c.test prefix.test primary.test \ - primary2.test primary3.test proginst.test python.test \ - python2.test python3.test python4.test python5.test \ - python6.test python7.test python8.test python9.test \ - python10.test python11.test python12.test recurs.test \ - recurs2.test remake.test remake2.test remake3.test \ - remake4.test remake5.test regex.test req.test reqd.test \ - reqd2.test rulepat.test scripts.test seenc.test sinclude.test \ - srcsub.test srcsub2.test space.test specflg.test specflg2.test \ - specflg3.test specflg6.test specflg7.test specflg8.test \ - specflg9.test spell.test spell2.test spell3.test spelling.test \ - spy.test stamph2.test stdlib.test stdlib2.test strip.test \ - subdir.test subdir2.test subdir3.test subdir4.test \ - subdir5.test subdir6.test subdir7.test subdir8.test \ - subdir9.test subdirbuiltsources.test subcond.test \ - subcond2.test subcond3.test subobj.test subobj2.test \ - subobj3.test subobj4.test subobj5.test subobj6.test \ - subobj7.test subobj8.test subobj9.test subobjname.test \ - subpkg.test subpkg2.test subpkg3.test subst.test subst2.test \ - substref.test substre2.test substtarg.test suffix.test \ - suffix2.test suffix3.test suffix4.test suffix5.test \ - suffix6.test suffix7.test suffix8.test suffix9.test \ - suffix10.test suffix11.test symlink.test symlink2.test \ - symlink3.test syntax.test tags.test tagsub.test tar.test \ - tar2.test tar3.test target-cflags.test targetclash.test \ - txinfo.test txinfo2.test txinfo3.test txinfo4.test \ - txinfo5.test txinfo6.test txinfo7.test txinfo8.test \ - txinfo9.test txinfo10.test txinfo13.test txinfo16.test \ - txinfo17.test txinfo18.test txinfo19.test txinfo20.test \ - txinfo21.test txinfo22.test txinfo23.test txinfo24.test \ - txinfo25.test txinfo26.test txinfo27.test txinfo28.test \ - txinfo29.test txinfo30.test transform.test unused.test \ - vars.test vars3.test vartar.test version.test version2.test \ - version3.test version4.test version6.test version7.test \ - version8.test vpath.test vtexi.test vtexi2.test warnopts.test \ - werror.test werror2.test whoami.test xsource.test yacc.test \ - yacc2.test yacc3.test yacc4.test yacc5.test yacc6.test \ - yacc7.test yacc8.test yaccpp.test yaccvpath.test + dirlist2.test discover.test distcom2.test distcom3.test \ + distcom4.test distcom5.test distcom6.test distcom7.test \ + distdir.test distname.test dollar.test double.test dup2.test \ + else.test empty.test empty2.test empty3.test empty4.test \ + exdir.test exdir2.test exeext.test exeext2.test exeext3.test \ + exeext4.test exsource.test ext.test ext2.test extra.test \ + extra3.test extra4.test extra5.test extra6.test extra7.test \ + f90only.test flibs.test fn99.test fnoc.test fo.test fonly.test \ + fortdep.test fpinst2.test fpinstall.test gcj.test gcj2.test \ + gcj3.test gcj4.test gcj5.test getopt.test gettext.test \ + gettext2.test gnumake.test gnuwarn.test gnuwarn2.test \ + gnits.test gnits2.test gnits3.test header.test help.test \ + hfs.test hosts.test implicit.test include.test include2.test \ + info.test insh2.test install2.test installdir.test instsh.test \ + instsh2.test instdat.test instdat2.test instexec.test \ + insthook.test instman.test instman2.test instspc.test \ + interp.test interp2.test java.test java2.test java3.test \ + javaprim.test javasubst.test ldadd.test ldflags.test lex.test \ + lex2.test lex3.test lex4.test lex5.test libobj2.test \ + libobj3.test libobj4.test libobj5.test libobj7.test \ + libobj8.test libobj10.test libobj11.test libobj12.test \ + libobj13.test libobj14.test library.test library2.test \ + library3.test libtool.test libtool2.test libtool3.test \ + libtool4.test libtool5.test libtool6.test libtool7.test \ + libtool8.test libtool9.test license.test link_c_cxx.test \ + link_dist.test link_f90_only.test link_fc.test link_fccxx.test \ + link_fcxx.test link_f_only.test lisp2.test lisp3.test \ + lisp4.test lisp5.test lisp6.test lisp7.test lisp8.test \ + listval.test location.test longline.test longlin2.test \ + ltcond.test ltcond2.test ltconv.test ltdeps.test \ + ltlibobjs.test ltlibsrc.test maintclean.test make.test \ + makej.test makevars.test man.test man2.test mclean.test \ + mdate.test mdate2.test mdate3.test mdate4.test missing.test \ + missing2.test missing3.test mkinstall.test mkinst2.test \ + mkinst3.test mmodely.test multlib.test nobase.test nodef.test \ + nodef2.test nodep.test nodepcomp.test nodist.test nodist2.test \ + nodist3.test nogzip.test nogzip2.test noinst.test \ + noinstdir.test nolink.test nostdinc.test number.test objc.test \ + objc2.test obsolete.test order.test outdir.test output.test \ + output2.test output3.test output4.test output5.test \ + output6.test output7.test output8.test output9.test \ + output10.test output11.test output12.test overrid.test \ + parse.test percent.test percent2.test phony.test pluseq.test \ + pluseq2.test pluseq3.test pluseq4.test pluseq5.test \ + pluseq6.test pluseq7.test pluseq8.test pluseq9.test \ + pluseq10.test postproc.test ppf77.test pr2.test pr9.test \ + pr72.test pr87.test pr204.test pr211.test pr220.test \ + pr224.test pr229.test pr243.test pr266.test pr279.test \ + pr279-2.test pr287.test pr300-lib.test pr300-ltlib.test \ + pr300-prog.test pr307.test pr401.test pr401b.test pr401c.test \ + prefix.test primary.test primary2.test primary3.test \ + proginst.test python.test python2.test python3.test \ + python4.test python5.test python6.test python7.test \ + python8.test python9.test python10.test python11.test \ + python12.test recurs.test recurs2.test remake.test \ + remake2.test remake3.test remake4.test remake5.test regex.test \ + req.test reqd.test reqd2.test rulepat.test scripts.test \ + seenc.test sinclude.test srcsub.test srcsub2.test space.test \ + specflg.test specflg2.test specflg3.test specflg6.test \ + specflg7.test specflg8.test specflg9.test spell.test \ + spell2.test spell3.test spelling.test spy.test stamph2.test \ + stdlib.test stdlib2.test strip.test subdir.test subdir2.test \ + subdir3.test subdir4.test subdir5.test subdir6.test \ + subdir7.test subdir8.test subdir9.test subdirbuiltsources.test \ + subcond.test subcond2.test subcond3.test subobj.test \ + subobj2.test subobj3.test subobj4.test subobj5.test \ + subobj6.test subobj7.test subobj8.test subobj9.test \ + subobjname.test subpkg.test subpkg2.test subpkg3.test \ + subst.test subst2.test substref.test substre2.test \ + substtarg.test suffix.test suffix2.test suffix3.test \ + suffix4.test suffix5.test suffix6.test suffix7.test \ + suffix8.test suffix9.test suffix10.test suffix11.test \ + symlink.test symlink2.test symlink3.test syntax.test tags.test \ + tagsub.test tar.test tar2.test tar3.test target-cflags.test \ + targetclash.test txinfo.test txinfo2.test txinfo3.test \ + txinfo4.test txinfo5.test txinfo6.test txinfo7.test \ + txinfo8.test txinfo9.test txinfo10.test txinfo13.test \ + txinfo16.test txinfo17.test txinfo18.test txinfo19.test \ + txinfo20.test txinfo21.test txinfo22.test txinfo23.test \ + txinfo24.test txinfo25.test txinfo26.test txinfo27.test \ + txinfo28.test txinfo29.test txinfo30.test transform.test \ + unused.test vars.test vars3.test vartar.test version.test \ + version2.test version3.test version4.test version6.test \ + version7.test version8.test vpath.test vtexi.test vtexi2.test \ + warnopts.test werror.test werror2.test whoami.test \ + xsource.test yacc.test yacc2.test yacc3.test yacc4.test \ + yacc5.test yacc6.test yacc7.test yacc8.test yaccpp.test \ + yaccvpath.test subdir = tests DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ $(srcdir)/aclocal.in $(srcdir)/automake.in $(srcdir)/defs.in diff --git a/tests/xsource.test b/tests/xsource.test index 2f5011b..d6e6a35 100755 --- a/tests/xsource.test +++ b/tests/xsource.test @@ -40,6 +40,6 @@ mkdir x : > z.c : > x/z.c -$ACLOCAL || exit 1 +$ACLOCAL AUTOMAKE_fails $FGREP 'z.$(OBJEXT)' stderr -- 2.7.4