From 66ab18aedf422dd2a463112acc8310779a7f703e Mon Sep 17 00:00:00 2001 From: Stefano Lattarini Date: Fri, 10 May 2013 10:50:05 +0200 Subject: [PATCH] cosmetics: fix few typos, grammaros and missing whitespace * lib/am/*.am: In comments in some of these files. Signed-off-by: Stefano Lattarini --- lib/am/check.am | 2 +- lib/am/header-vars.am | 4 ++-- lib/am/library.am | 1 + lib/am/ltlibrary.am | 1 + lib/am/program.am | 1 + lib/am/remake-hdr.am | 2 +- 6 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/am/check.am b/lib/am/check.am index b39395c..7012d5a 100644 --- a/lib/am/check.am +++ b/lib/am/check.am @@ -238,7 +238,7 @@ am__set_TESTS_bases = \ $(MAKE) $(AM_MAKEFLAGS) $< # Leading 'am--fnord' is there to ensure the list of targets does not -# exand to empty, as could happen e.g. with make check TESTS=''. +# expand to empty, as could happen e.g. with make check TESTS=''. am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) am--force-recheck: @: diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am index aef1082..1a6f28e 100644 --- a/lib/am/header-vars.am +++ b/lib/am/header-vars.am @@ -52,7 +52,7 @@ am__make_running_with_option = \ ## brittle, but is the best we can do. case $$MAKEFLAGS in \ ## If we run "make TESTS='snooze nap'", FreeBSD make will export MAKEFLAGS -## to " TESTS=foo\ nap", so that the simpler loop below (on word-splitted +## to " TESTS=foo\ nap", so that the simpler loop below (on word-split ## $$MAKEFLAGS) would see a "make flag" equal to "nap", and would wrongly ## misinterpret that as and indication that make is running in dry mode. ## This has already happened in practice. So we need this hack. @@ -110,7 +110,7 @@ am__make_dryrun = (target_option=n; $(am__make_running_with_option)) ## Shell code that determines whether make is running in "keep-going mode" ## ("make -k") or not. Useful in rules that must recursively descend into -## subdirectories, and decide whther to stop at the first error or not. +## subdirectories, and decide whether to stop at the first error or not. am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) ## Some derived variables that have been found to be useful. diff --git a/lib/am/library.am b/lib/am/library.am index 2462984..c01d221 100644 --- a/lib/am/library.am +++ b/lib/am/library.am @@ -13,6 +13,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . + %LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) $(EXTRA_%XLIBRARY%_DEPENDENCIES) %DIRSTAMP% %SILENT%-rm -f %LIBRARY% %VERBOSE%$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD) diff --git a/lib/am/ltlibrary.am b/lib/am/ltlibrary.am index 0c6f4c6..642d032 100644 --- a/lib/am/ltlibrary.am +++ b/lib/am/ltlibrary.am @@ -13,5 +13,6 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . + %LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) $(EXTRA_%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP% %VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS) diff --git a/lib/am/program.am b/lib/am/program.am index c3b7962..131c4a9 100644 --- a/lib/am/program.am +++ b/lib/am/program.am @@ -13,6 +13,7 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . + %PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) $(EXTRA_%XPROGRAM%_DEPENDENCIES) %DIRSTAMP% ## Remove program before linking. Otherwise the link will fail if the ## program is running somewhere. FIXME: this could be a loss if diff --git a/lib/am/remake-hdr.am b/lib/am/remake-hdr.am index f2a203f..1703b01 100644 --- a/lib/am/remake-hdr.am +++ b/lib/am/remake-hdr.am @@ -15,7 +15,7 @@ ## along with this program. If not, see . %CONFIG_H%: %STAMP% -## Recover from removal of CONFIG_HEADER +## Recover from removal of CONFIG_HEADER. @if test ! -f $@; then rm -f %STAMP%; else :; fi @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) %STAMP%; else :; fi -- 2.7.4