]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'je-silent'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 24 Jan 2010 11:37:36 +0000 (12:37 +0100)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Sun, 24 Jan 2010 11:37:36 +0000 (12:37 +0100)
* je-silent:
  Fix silent-rules output for disabled dependency tracking.

1  2 
NEWS
THANKS
automake.in
tests/Makefile.am
tests/Makefile.in

diff --cc NEWS
Simple merge
diff --cc THANKS
Simple merge
diff --cc automake.in
index 482972b78614d9b853e527dd292e87c15687d150,116fc7decead738ff450176c797204092d8bdfed..8029dc91b995cad96674a515f3b59ffff719279e
mode 100644,100755..100644
index 3428b443c2dd768ee5a4d35892d0c57c6ae2f88e,3b4c850b31cbdddef0f5416d2282fb3e0093dd8c..ec28566a4e9d782195a986789a6c058534c7f0bb
@@@ -613,7 -605,7 +613,8 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
+ silent9.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \
index b84dd1dca7bdc49c2a5bf58f5dd49e9faf82e7b1,f3a3e4655346318b107d86bdb787890546d06ef9..3393f06d8a6580f4505662f0ea8102ac18f60533
@@@ -854,7 -839,7 +854,8 @@@ silent4.test 
  silent5.test \
  silent6.test \
  silent7.test \
 +silent8.test \
+ silent9.test \
  sinclude.test \
  srcsub.test \
  srcsub2.test \