From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 9 Feb 2012 19:37:05 +0000 (+0100)
Subject: [ng] maintcheck: fix real and spurious warnings
X-Git-Tag: ng-0.5a~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5e4bc2a07ff82288ef79c8f3959618506b6a1ac;p=thirdparty%2Fautomake.git

[ng] maintcheck: fix real and spurious warnings

This failures have been introduced by the recent merging of
master.

* lib/am/check.am: Don't use '$(AM_MAKEFLAGS)' in recursive make
invocations.
* tests/make-dryrun.test: Likewise.  Also, avoid code to determine
whether $MAKE is GNU make or supports the required make features:
we can assume that unconditionally.
* lib/am/header-vars.am: Remove references to NetBSD and Solaris
make from the comments.
---

diff --git a/lib/am/check.am b/lib/am/check.am
index 9cb3b76a4..8df0c6a3c 100644
--- a/lib/am/check.am
+++ b/lib/am/check.am
@@ -161,7 +161,7 @@ $(TEST_SUITE_LOG): $(TEST_LOGS)
 	  echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
 	       "recursion detected" >&2; \
 	else \
-	  am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
+	  am__remaking_logs=yes $(MAKE) $$redo_logs; \
 	fi; \
 	if $(am__make_dryrun); then :; else \
 ## Sanity check: each unreadable or non-existent test result file should
diff --git a/lib/am/header-vars.am b/lib/am/header-vars.am
index 6662dc629..1bfc5aef7 100644
--- a/lib/am/header-vars.am
+++ b/lib/am/header-vars.am
@@ -31,10 +31,9 @@ am__vpath_rewrite = \
 ## DESTDIR =
 
 ## Shell code that determines whether make is running in "dry mode"
-## ("make -n") or not.  Useful in rules that invoke make recursively,
-## and are thus executed also with "make -n" -- either because they
-## are declared as dependencies to '.MAKE' (NetBSD make), or because
-## their recipes contain the "$(MAKE)" string (GNU and Solari make).
+## ("make -n") or not.  Useful in rules that invoke make recursively, and
+## are thus executed also with "make -n" -- because, say, their recipes
+## contain the "$(MAKE)" string or starts with the '+' modifier.
 am__make_dryrun = \
   { \
     am__dry=no; \
diff --git a/tests/make-dryrun.test b/tests/make-dryrun.test
index 0202dc909..ade314f96 100755
--- a/tests/make-dryrun.test
+++ b/tests/make-dryrun.test
@@ -46,20 +46,16 @@ $MAKE notdry
 # heinous, since make running in normal mode was sometimes
 # mistaken for make running in dry mode.
 $MAKE notdry TESTS="n1.test n2.test"
-$MAKE notdry TESTS="n1 n2" AM_MAKEFLAGS="TESTS='n1 n2'"
-$MAKE notdry TESTS="n1 n2" AM_MAKEFLAGS='TESTS="n1 n2"'
+$MAKE notdry TESTS="n1 n2"
+$MAKE notdry TESTS="n1 n2"
 $MAKE notdry FOOFLAGS="-n -n -knf2 \\n --none -n"
 $MAKE notdry BARFLAGS="-n \"n\" '-n' --none -n"
 
-if echo 'all: ; @+printf %sbb%s aa cc' | $MAKE -n -f - | grep aabbcc; then
-  $MAKE -n dry
-  test -f from-dry-mode
-  rm -f from-dry-mode
-fi
+$MAKE -n dry
+test -f from-dry-mode
+rm -f from-dry-mode
 
-if using_gmake; then
-  $MAKE --dry-run -k dry
-  test -f from-dry-mode
-fi
+$MAKE --dry-run -k dry
+test -f from-dry-mode
 
 :