]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'jk-silent'
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 25 Sep 2009 19:18:58 +0000 (21:18 +0200)
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>
Fri, 25 Sep 2009 19:18:58 +0000 (21:18 +0200)
* jk-silent:
  Use silent-rules for building the Automake package.
  Add silent rules support for texinfo outputs.

13 files changed:
1  2 
ChangeLog
Makefile.in
NEWS
aclocal.m4
configure
configure.ac
doc/Makefile.in
lib/Automake/Makefile.in
lib/Automake/tests/Makefile.in
lib/Makefile.in
lib/am/Makefile.in
m4/Makefile.in
tests/Makefile.in

diff --cc ChangeLog
Simple merge
diff --cc Makefile.in
Simple merge
diff --cc NEWS
index 7e14ed893cc83ac2737fa1659e35b233cba8c467,7b7ab1175c7431e0be5035307cb2411c4bf8369a..26a8b31a3c259ec13861080e729cf0365ee5ab9e
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,6 -1,10 +1,10 @@@
 -New in 1.11.0a:
 +New in 1.11a:
  
 -Bugs fixed in 1.11.0a:
+ * Changes to automake:
+   - automake now generates silenced rules for texinfo outputs.
 +Bugs fixed in 1.11a:
  
  * Bugs introduced by 1.11:
  
diff --cc aclocal.m4
Simple merge
diff --cc configure
Simple merge
diff --cc configure.ac
Simple merge
diff --cc doc/Makefile.in
Simple merge
Simple merge
Simple merge
diff --cc lib/Makefile.in
Simple merge
Simple merge
diff --cc m4/Makefile.in
Simple merge
Simple merge