From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 24 Jan 2010 11:37:36 +0000 (+0100)
Subject: Merge branch 'je-silent'
X-Git-Tag: ng-0.5a~445
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=335494d7f1baaeb1ba18c306a36e15dd71659218;p=thirdparty%2Fautomake.git

Merge branch 'je-silent'

* je-silent:
  Fix silent-rules output for disabled dependency tracking.
---

335494d7f1baaeb1ba18c306a36e15dd71659218
diff --cc automake.in
index 482972b78,116fc7dec..8029dc91b
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in
diff --cc tests/Makefile.am
index 3428b443c,3b4c850b3..ec28566a4
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -613,7 -605,7 +613,8 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
+ silent9.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \
diff --cc tests/Makefile.in
index b84dd1dca,f3a3e4655..3393f06d8
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -854,7 -839,7 +854,8 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
+ silent9.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \