From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sun, 9 Jan 2011 14:30:42 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a71a5686d83f58b2f50f1fc8b4b005a61d8ab127;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

a71a5686d83f58b2f50f1fc8b4b005a61d8ab127
diff --cc ChangeLog
index 79bdc3f3a,b59819f8f..ff110e691
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,43 +1,63 @@@
+ 2011-01-09   Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	cosmetics: remove trailing whitespaces
+ 	* doc/automake.texi: Remove trailing whitespaces.
+ 	* tests/cond13.test: Likewise.
+ 	* tests/cond14.test: Likewise.
+ 	* tests/fort4.test: Likewise.
+ 	* tests/fort5.test: Likewise.
+ 	* tests/suffix7.test: Likewise.
+ 	* tests/vtexi2.test: Likewise.
+ 
+ 	automake: minor fixes in comments
+ 	* automake.in: Some minor fixes and enhancements in comments.
+ 
+ 2011-01-09  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Add test coverage for deleted header files.
+ 	* tests/depcomp6.test, tests/depcomp7.test: Update tests to
+ 	also check for the deleted header bug.  If no dependency
+ 	tracking mechanism could be found, SKIP rather than exit
+ 	successfully.  Use GNU style spacing and ANSI C prototypes.
+ 
+ 	Fix typos in Rule.pm comments.
+ 	* lib/Automake/Rule.pm: Fix typos in comments.
+ 
+ 	docs: split 'amhello Explained' node.
+ 	* doc/automake.texi (amhello Explained): Split node ...
+ 	(amhello's configure.ac Setup Explained)
+ 	(amhello's Makefile.am Setup Explained) : ... into these two.
+ 	(Top, Hello World): Adjust, and add @anchor for stable URL links.
+ 	Suggestion by Karl Berry in automake bug#7766.
+ 
+ 2011-01-08  Karl Berry  <karl@freefriends.org>
+ 	    Eric Blake  <eblake@redhat.com>
+ 
+ 	docs: reference defining directories in amhello node.
+ 	* doc/automake.texi (amhello Explained): Point to Autoconf
+ 	manual for how to convert directory values into macros.
+ 	(Optional): Fix grammar nit.
+ 
 +2011-01-07   Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	yacc: "make clean" removes .c and .h files from non-distributed .y
 +	Previously, while automake did *not* distribute C source and header
 +	files derived from non-distributed Yacc sources, it still caused
 +	them to be removed only by "make maintainer-clean" only, and not by
 +	simply "make clean" or "make distclean".
 +	This caused "make distcheck" to fail, unless the developer put
 +	those generated .c and .h files in CLEANFILES or in DISTCLEANFILES
 +	by hand.
 +	This change fixes this issue, by making non-distributed `.c' and
 +	`.h' files generated by non-distributed Yacc sources cleaned by
 +	"make clean".
 +	* tests/automake.in (lang_yacc_target_hook): Make C source and
 +	header files derived from non-distributed Yacc files cleaned by
 +	"make clean", not only by "make maintainer-clean".
 +	* tests/yacc-clean.test: New test.
 +	* tests/Makefile.am (TESTS): Update.
 +	* NEWS: Update.
 +
  2011-01-02   Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	* NEWS: Fix typo (forgotten word).
diff --cc automake.in
index 7737ff007,d56fbf7e8..bdbb4f086
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in