diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Automake/Channels.pm | 8 | ||||
| -rw-r--r-- | lib/Automake/Rule.pm | 18 | ||||
| -rw-r--r-- | lib/Automake/Variable.pm | 4 | ||||
| -rw-r--r-- | lib/Automake/tests/Condition.pl | 4 | ||||
| -rw-r--r-- | lib/am/dejagnu.am | 4 | ||||
| -rw-r--r-- | lib/am/depend.am | 2 | ||||
| -rw-r--r-- | lib/am/lisp.am | 4 | ||||
| -rw-r--r-- | lib/am/remake-hdr.am | 2 | ||||
| -rw-r--r-- | lib/am/texi-vers.am | 2 | ||||
| -rw-r--r-- | lib/ansi2knr.c | 4 | ||||
| -rwxr-xr-x | lib/depcomp | 6 | ||||
| -rwxr-xr-x | lib/missing | 2 | ||||
| -rwxr-xr-x | lib/py-compile | 2 |
13 files changed, 31 insertions, 31 deletions
diff --git a/lib/Automake/Channels.pm b/lib/Automake/Channels.pm index eaeed1cdd..ddd7f1ece 100644 --- a/lib/Automake/Channels.pm +++ b/lib/Automake/Channels.pm @@ -158,7 +158,7 @@ C<$warnings_are_errors> is set. =item C<exit_code =E<gt> 1> The value to update C<$exit_code> with when a fatal or error message -is emited. C<$exit_code> is also updated for warnings output +is emitted. C<$exit_code> is also updated for warnings output when @<$warnings_are_errors> is set. =item C<file =E<gt> \*STDERR> @@ -255,7 +255,7 @@ use vars qw (%_default_options %_global_duplicate_messages ); # Filled with output messages as keys, to detect duplicates. -# The value associated to each keys is the number of occurences +# The value associated with each key is the number of occurrences # filtered out. %_local_duplicate_messages = (); %_global_duplicate_messages = (); @@ -495,7 +495,7 @@ the following would be output: C<$location> can also be an instance of C<Automake::Location>. In this case the stack of contexts will be displayed in addition. -If C<$message> contains new line caracters, C<$location> is prepended +If C<$message> contains newline characters, C<$location> is prepended to each line. For instance msg 'error', 'somewhere', "1st line\n2nd line"; @@ -635,7 +635,7 @@ By default, when C<msg> is called, messages are processed immediately. Sometimes it is necessary to delay the output of messages. For instance you might want to make diagnostics before -channels have been completly configured. +channels have been completely configured. After C<buffer_messages(@types)> has been called, messages sent with C<msg> to a channel whose type is listed in C<@types> will be stored in a diff --git a/lib/Automake/Rule.pm b/lib/Automake/Rule.pm index fd6471d45..64e4c264d 100644 --- a/lib/Automake/Rule.pm +++ b/lib/Automake/Rule.pm @@ -369,7 +369,7 @@ sub register_suffix_rule ($$$) verb "Sources ending in $src become $dest"; push @_suffixes, $src, $dest; - # When tranforming sources to objects, Automake uses the + # When transforming sources to objects, Automake uses the # %suffix_rules to move from each source extension to # `.$(OBJEXT)', not to `.o' or `.obj'. However some people # define suffix rules for `.o' or `.obj', so internally we will @@ -412,7 +412,7 @@ sub register_suffix_rule ($$$) } # Similarly, any extension that can be derived into $src - # can be derived into the same extenstions as $src can. + # can be derived into the same extensions as $src can. my @dest2 = keys %{$suffix_rules->{$src}}; for my $src2 (keys %$suffix_rules) { @@ -624,7 +624,7 @@ sub define ($$$$$) # already diagnosed as unportable by -Wportability. if ($target !~ /^[^%]*%[^%]*$/) { - ## FIXME: Presently we can't diagnose duplcate user rules + ## FIXME: Presently we can't diagnose duplicate user rules ## because we doesn't distinguish rules with commands ## from rules that only add dependencies. E.g., ## .PHONY: foo @@ -709,7 +709,7 @@ sub define ($$$$$) # Check ambiguous conditional definitions. my $rule = _crule $target; my ($message, $ambig_cond) = $rule->conditions->ambiguous_p ($target, $cond); - if ($message) # We have an ambiguty. + if ($message) # We have an ambiguity. { if ($owner == RULE_USER) { @@ -788,8 +788,8 @@ sub define ($$$$$) } } - # POSIX allow multiple targets befor the colon, but disallow - # definitions of multiple Inference rules. It's also + # POSIX allows multiple targets before the colon, but disallows + # definitions of multiple inference rules. It's also # disallowed to mix plain targets with inference rules. msg ('portability', $where, "Inference rules can have only one target before the colon (POSIX).") @@ -802,14 +802,14 @@ sub define ($$$$$) Adds C<@deps> to the dependencies of target C<$target>. This should be used only with factored targets (those appearing in -C<%dependendees>). +C<%dependees>). =cut sub depend ($@) { - my ($category, @dependendees) = @_; - push (@{$dependencies{$category}}, @dependendees); + my ($category, @dependees) = @_; + push (@{$dependencies{$category}}, @dependees); } =back diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index e5d6a54f4..6c63337af 100644 --- a/lib/Automake/Variable.pm +++ b/lib/Automake/Variable.pm @@ -719,11 +719,11 @@ sub scan_variable_expansions ($) # Strip comments. $text =~ s/#.*$//; - # Record each use of ${stuff} or $(stuff) that do not follow a $. + # Record each use of ${stuff} or $(stuff) that does not follow a $. while ($text =~ /(?<!\$)\$(?:\{([^\}]*)\}|\(([^\)]*)\))/g) { my $var = $1 || $2; - # The occurent may look like $(string1[:subst1=[subst2]]) but + # The occurence may look like $(string1[:subst1=[subst2]]) but # we want only `string1'. $var =~ s/:[^:=]*=[^=]*$//; push @result, $var; diff --git a/lib/Automake/tests/Condition.pl b/lib/Automake/tests/Condition.pl index 5998a64e7..c2617038e 100644 --- a/lib/Automake/tests/Condition.pl +++ b/lib/Automake/tests/Condition.pl @@ -135,7 +135,7 @@ sub test_reduce_and () [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"], ["FOO BAZ BAR"]], - # Duplicated condionals should be removed + # Duplicated conditionals should be removed. [["FOO", "BAR", "BAR"], ["BAR,FOO"]], # Equivalent conditions in different forms should be @@ -211,7 +211,7 @@ sub test_reduce_or () [["FOO", "FOO BAR", "BAZ", "FOO BAZ", "FOO BAZ BAR"], ["BAZ,FOO"]], - # Duplicated condionals should be removed + # Duplicated conditionals should be removed. [["FOO", "BAR", "BAR"], ["BAR,FOO"]], # Equivalent conditions in different forms should be diff --git a/lib/am/dejagnu.am b/lib/am/dejagnu.am index e4154c8a6..e220b9359 100644 --- a/lib/am/dejagnu.am +++ b/lib/am/dejagnu.am @@ -17,7 +17,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## Flags for DejaGNU. +## Flags for DejaGnu. RUNTESTFLAGS = ## Name of tool to use. Default is the same as the package. @@ -51,7 +51,7 @@ check-DEJAGNU: site.exp ## Life is easiest with an absolute srcdir, so do that. srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ EXPECT=$(EXPECT); export EXPECT; \ -## Allow this to work when expect and DejaGNU are in tree. +## Allow this to work when expect and DejaGnu are in tree. ## Only required when --cygnus in force. ?CYGNUS? if [ -f $(top_builddir)/../expect/expect ]; then \ ?CYGNUS? TCL_LIBRARY=`$(am__cd) $(top_srcdir)/../tcl/library && pwd`; \ diff --git a/lib/am/depend.am b/lib/am/depend.am index be4eccc66..f2923490e 100644 --- a/lib/am/depend.am +++ b/lib/am/depend.am @@ -17,7 +17,7 @@ ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA ## 02111-1307, USA. -## Depdirs's files are dependency of this Makefile, so we should never +## This Makefile depends on Depdirs' files, so we should never ## erase them in -am or -recursive rules; that would prevent any other ## rules from being recursive (for instance multilib clean rules are ## recursive). diff --git a/lib/am/lisp.am b/lib/am/lisp.am index 5b0ea0239..daea72ef6 100644 --- a/lib/am/lisp.am +++ b/lib/am/lisp.am @@ -25,9 +25,9 @@ elc-stamp: $(am__ELFILES) @echo 'WARNING: Warnings can be ignored. :-)' if test $(EMACS) != no; then \ -## Make sure "$@" isn't empty initialy. +## Make sure "$@" isn't empty initially. set x; \ -## Populate "$@" whith elisp files (found in the current directory +## Populate "$@" with elisp files (found in the current directory ## or in $srcdir). list='$(am__ELFILES)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index 04c859313..063ddb796 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -37,7 +37,7 @@ $(srcdir)/%CONFIG_HIN%: %MAINTAINER-MODE% $(top_srcdir)/%CONFIGURE-AC% $(ACLOCAL cd $(top_srcdir) && $(AUTOHEADER) ## Autoheader has the bad habit of not changing the time stamp if ## config.hin is unchanged, which breaks Make targets. Since what -## must not changed gratuitiously is config.h, which is already handled +## must not changed gratuitously is config.h, which is already handled ## by config.status, there is no reason to make things complex for ## config.hin. touch $(srcdir)/%CONFIG_HIN% diff --git a/lib/am/texi-vers.am b/lib/am/texi-vers.am index c164fef53..9a1004b4a 100644 --- a/lib/am/texi-vers.am +++ b/lib/am/texi-vers.am @@ -23,7 +23,7 @@ DIST_COMMON += %VTEXI% %STAMPVTI% ## %STAMPVTI% is always newer than %VTEXI%, so this rule is always ## triggered. If you equip this rule with a command, GNU make will ## assume %VTEXI% has been rebuild in the current directory and -## discard any %VTEXI% file found in a VPATH seatch. +## discard any %VTEXI% file found in a VPATH search. %VTEXI%: %MAINTAINER-MODE% %STAMPVTI% ## Depend on configure so that version number updates cause a rebuild. diff --git a/lib/ansi2knr.c b/lib/ansi2knr.c index 00b96b9da..e84c210b6 100644 --- a/lib/ansi2knr.c +++ b/lib/ansi2knr.c @@ -1,6 +1,6 @@ /* Copyright (C) 1989, 2000 Aladdin Enterprises. All rights reserved. */ -/*$Id: ansi2knr.c,v 1.13 2001/05/20 05:59:43 tromey Exp $*/ +/*$Id: ansi2knr.c,v 1.14 2003/09/06 05:36:56 eggert Exp $*/ /* Convert ANSI C function definitions to K&R ("traditional C") syntax */ /* @@ -64,7 +64,7 @@ program under the GPL. lpd 2000-04-12 backs out Eggert's changes because of bugs: - concatlits didn't declare the type of its bufend argument; - - concatlits didn't't recognize when it was inside a comment; + - concatlits didn't recognize when it was inside a comment; - scanstring could scan backward past the beginning of the string; when - the check for \ + newline in scanstring was unnecessary. diff --git a/lib/depcomp b/lib/depcomp index 86f7f1539..dcb2b19d5 100755 --- a/lib/depcomp +++ b/lib/depcomp @@ -299,7 +299,7 @@ tru64) dashmstdout) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o. + # always write the preprocessed file to stdout, regardless of -o. "$@" || exit $? # Remove the call to Libtool. @@ -395,7 +395,7 @@ makedepend) cpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout. + # always write the preprocessed file to stdout. "$@" || exit $? # Remove the call to Libtool. @@ -437,7 +437,7 @@ cpp) msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the proprocessed file to stdout, regardless of -o, + # always write the preprocessed file to stdout, regardless of -o, # because we must use -o when running libtool. "$@" || exit $? IFS=" " diff --git a/lib/missing b/lib/missing index 8d85d40f6..fc54c64ec 100755 --- a/lib/missing +++ b/lib/missing @@ -326,7 +326,7 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments. WARNING: \`$1' is needed, and you do not seem to have it handy on your system. You might have modified some files without having the proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequirements for installing + it often tells you about the needed prerequisites for installing this package. You may also peek at any GNU archive site, in case some other package would contain this missing \`$1' program." exit 1 diff --git a/lib/py-compile b/lib/py-compile index a055fae4f..4c84b678a 100755 --- a/lib/py-compile +++ b/lib/py-compile @@ -80,7 +80,7 @@ $PYTHON -O -c " import sys, os, string, py_compile files = '''$*''' -print 'Byte-compiling python modules (optimised versions) ...' +print 'Byte-compiling python modules (optimized versions) ...' for file in string.split(files): $trans if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'): |