From: Stefano Lattarini Date: Sun, 10 Jun 2012 12:12:55 +0000 (+0200) Subject: [ng] cosmetics: remove trailing whitespace from few files X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6ce19bd6374fef13304eacce9dc7f684b579aec;p=thirdparty%2Fautomake.git [ng] cosmetics: remove trailing whitespace from few files Signed-off-by: Stefano Lattarini --- diff --git a/NG-NEWS b/NG-NEWS index 4d5431d9f..16d007488 100644 --- a/NG-NEWS +++ b/NG-NEWS @@ -3,7 +3,7 @@ Automake and Automake-NG. Be aware that there is likely a plethora of other minor differences and incompatibilities *not* listed here. -Automatic dependency tracking support +Automatic dependency tracking support ===================================== * The generated Makefile.in files use "-include", not "include", to @@ -274,7 +274,7 @@ Source Files with Unknown Extensions file, and appending either '.$(OBJEXT)' or '.lo' to it (which one depends on whether the object is built as part of a program, a static library, or a libtool library). It will then be assumed that the user has defined a - rule (either explicit or defined from a pattern rule) which can turn that + rule (either explicit or defined from a pattern rule) which can turn that source file into this corresponding object file. For example, on an input like: diff --git a/automake.in b/automake.in index 0b4cf2430..ce3cd6e53 100644 --- a/automake.in +++ b/automake.in @@ -877,7 +877,7 @@ register_language ('name' => 'asm', 'config_vars' => ['CCAS', 'CCASFLAGS'], 'flags' => ['CCASFLAGS'], - # Users can set AM_CCASFLAGS to include, say, DEFS, + # Users can set AM_CCASFLAGS to include, say, DEFS, # or anything else required. They can also set CCAS. # Or simply use Preprocessed Assembler. 'compile' => '$(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS)', @@ -7275,7 +7275,7 @@ sub generate_makefile ($$) # See if any _SOURCES (or _LIBADD, or ...) variable were misspelled. $output_checks .= preprocess_file ("$libdir/am/check-typos.am"); # Report errors (if any) seen at make runtime. - $output_checks .= '$(if $(am__seen_error),' . + $output_checks .= '$(if $(am__seen_error),' . '$(error Some Automake-NG error occurred))' . "\n"; diff --git a/t/distcheck-override-infodir.sh b/t/distcheck-override-infodir.sh index a9f3f91fa..71543c9b2 100755 --- a/t/distcheck-override-infodir.sh +++ b/t/distcheck-override-infodir.sh @@ -55,7 +55,7 @@ $AUTOCONF $MAKE $MAKE distcheck -$MAKE distcheck infodir="`pwd`"/_info +$MAKE distcheck infodir="`pwd`"/_info test -f _info/dir || Exit 99 # Sanity check. : diff --git a/t/insthook.sh b/t/insthook.sh index 0feba5c9c..04a5ff9cd 100755 --- a/t/insthook.sh +++ b/t/insthook.sh @@ -59,7 +59,7 @@ test -f ok ./configure "--bindir=`pwd`/bin" $MAKE install echo 2 > foo -$MAKE install VERSION=2.0 +$MAKE install VERSION=2.0 grep 1 bin/foo-1.0 grep 2 bin/foo-2.0 grep 2 bin/foo diff --git a/t/mmodely.sh b/t/mmodely.sh index d02690052..a628419ae 100755 --- a/t/mmodely.sh +++ b/t/mmodely.sh @@ -88,7 +88,7 @@ PATH="`pwd`$PATH_SEPARATOR$PATH" $MAKE maintainer-clean ./configure $MAKE zardoz.c joe.c YACC="myyacc.sh" LEX="mylex.sh" \ - LEX_OUTPUT_ROOT='lex.yy' + LEX_OUTPUT_ROOT='lex.yy' grep zardoz.y zardoz.c grep joe.l joe.c diff --git a/t/objc-flags.sh b/t/objc-flags.sh index 6c2b1e6a1..25f805b70 100755 --- a/t/objc-flags.sh +++ b/t/objc-flags.sh @@ -57,6 +57,6 @@ grep '\$(OBJCFLAGS).*\$(foo.*_OBJCFLAGS)' Makefile.in && Exit 1 grep '\$(foo.*_OBJCFLAGS).*\$(AM_OBJCFLAGS)' Makefile.in && Exit 1 ./configure OBJCFLAGS=-UERROR -$MAKE +$MAKE : diff --git a/t/objcxx-flags.sh b/t/objcxx-flags.sh index a948891da..082f7fbdc 100755 --- a/t/objcxx-flags.sh +++ b/t/objcxx-flags.sh @@ -58,6 +58,6 @@ grep '\$(OBJCXXFLAGS).*\$(foo.*_OBJCXXFLAGS)' Makefile.in && Exit 1 grep '\$(foo.*_OBJCXXFLAGS).*\$(AM_OBJCXXFLAGS)' Makefile.in && Exit 1 ./configure OBJCXXFLAGS=-UERROR -$MAKE +$MAKE : diff --git a/t/parallel-tests2.sh b/t/parallel-tests2.sh index 8dd1a1bfe..0735185ba 100755 --- a/t/parallel-tests2.sh +++ b/t/parallel-tests2.sh @@ -132,7 +132,7 @@ test ! -f baz.log test -f mylog.html $MAKE clean -$MAKE recheck-html TESTS=foo.test +$MAKE recheck-html TESTS=foo.test test -f bla test ! -f foo.log test -f mylog.html diff --git a/t/perf/testsuite-summary.sh b/t/perf/testsuite-summary.sh index a11bb8ef7..e245b6ed7 100755 --- a/t/perf/testsuite-summary.sh +++ b/t/perf/testsuite-summary.sh @@ -45,7 +45,7 @@ for i in `seq_ 1 $count`; do echo :test-result: PASS >> $i.trs echo :copy-in-global-log: yes >> $i.trs echo TESTS += $i.t -done >> Makefile.am +done >> Makefile.am # Re-enable shell traces. set -x diff --git a/t/silent2.sh b/t/silent2.sh index ee5fc0135..a7f0207d4 100755 --- a/t/silent2.sh +++ b/t/silent2.sh @@ -16,7 +16,7 @@ # Check silent-rules mode, without libtool, non-fastdep case # (so that, with GCC, we also cover the other code paths in depend2). - + # Please keep this file in sync with silent.test. required=gcc diff --git a/t/silentcxx.sh b/t/silentcxx.sh index 509048303..e35072659 100755 --- a/t/silentcxx.sh +++ b/t/silentcxx.sh @@ -17,7 +17,7 @@ # This test should work with generic C++ compilers; keep it in sync with # sister test 'silentcxx-gcc.test', which requires the GNU C++ compiler # and forces the use of gcc depmode. - + required=c++ . ./defs || Exit 1 diff --git a/t/suffix-custom-subobj.sh b/t/suffix-custom-subobj.sh index 54b6eff3c..254ab7907 100755 --- a/t/suffix-custom-subobj.sh +++ b/t/suffix-custom-subobj.sh @@ -50,7 +50,7 @@ $AUTOMAKE -a ./configure -$MAKE test-fake OBJEXT=quux +$MAKE test-fake OBJEXT=quux $MAKE test-real : diff --git a/t/suffix-obj.sh b/t/suffix-obj.sh index 925b6ac02..41d70eec7 100755 --- a/t/suffix-obj.sh +++ b/t/suffix-obj.sh @@ -77,7 +77,7 @@ cat > foo.exp <<'END' %THREE% END echo %THREE% > foo.zoo -$MAKE OBJEXT=obj +$MAKE OBJEXT=obj cat foo.obj cat foo.XxX diff foo.XxX foo.exp diff --git a/t/txinfo21b.sh b/t/txinfo21b.sh index 429c2bbbf..3e053de52 100755 --- a/t/txinfo21b.sh +++ b/t/txinfo21b.sh @@ -19,7 +19,7 @@ # Keep in sync with sister test 'txinfo21.sh'. # FIXME: in the long term, the best thing to do is probably to # FIXME: convert this test and the sister test 'txinfo21b.sh' to -# FIXME: TAP, and merge them. +# FIXME: TAP, and merge them. required='makeinfo-html tex texi2dvi' . ./defs || Exit 1 diff --git a/t/yacc-dist-nobuild-subdir.sh b/t/yacc-dist-nobuild-subdir.sh index 0e8612f46..174d704fe 100755 --- a/t/yacc-dist-nobuild-subdir.sh +++ b/t/yacc-dist-nobuild-subdir.sh @@ -83,6 +83,6 @@ chmod u+w . $MAKE all YACC=false ls -l sub/*.[ch] && Exit 1 -$MAKE distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' +$MAKE distcheck YACC=false DISTCHECK_CONFIGURE_FLAGS='YACC=false' :