From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Sat, 6 Nov 2010 19:32:48 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~348
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7adc0f46ecd072da071e5d6f166988e4288285e;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

f7adc0f46ecd072da071e5d6f166988e4288285e
diff --cc ChangeLog
index 16ec73370,e3559dc9f..a40dbc592
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,55 -1,29 +1,81 @@@
+ 2010-11-06  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Fix bug in rules for creating vala vapi/header files.
+ 	* automake.in (lang_vala_finish_target): Add forgotten "fi" in an
+ 	if control structure in a generated make rules.  Bug introduced
+ 	by previous commit `v1.11-221-gd7c1679', and revealed by failure
+ 	of test `vala2.test'.
+ 
+ 2010-11-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Fix and document rules to not touch the tree with `make -n'.
+ 	* doc/automake.texi (Multiple Outputs): Document the problem of
+ 	modifications during dry-run execution, propose solution.
+ 	* NEWS: Update.
+ 	* automake.in (lang_vala_finish_target): Split recipe so the
+ 	stamp file is not removed with GNU `make -n'.
+ 	(lang_yacc_target_hook): Separate removal of parser output file
+ 	and header remaking.
+ 	* lib/am/lisp.am ($(am__ELCFILES)): Determine whether -n was
+ 	passed to make, take care not to remove any files in that case.
+ 	* lib/am/remake-hdr.am (%CONFIG_H%): Separate removal of
+ 	%STAMP% file from induced remaking of config header.
+ 	* tests/autohdrdry.test, tests/lispdry.test, tests/yaccdry.test:
+ 	New tests.
+ 	* tests/Makefile.am (TESTS): Update.
+ 
 +2010-11-05  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Fix potential bug in generated tests `instpc-*.test'.
 +	This bug is due to the changes introduced by the recently-merged
 +	"tests-init" branch.  In that branch, `tests/defs' didn't define
 +	anymore `$srcdir', instead defininig directly `$testsrcdir'; but
 +	the generated tests were using `$srcdir', hence the bug.
 +	Luckily, since the Automake parallel test driver automatically
 +	exports `srcdir' to a proper value, that prevented the bug from
 +	manifesting itself.
 +	* tests/Makefile.am ($(instspc_tests)): In the generated test
 +	scripts, use `$testsrcdir', not `$srcdir'.
 +
 +2010-11-03  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Overhauled and modularized tests in `instspc.test'.
 +	The test `instspc.test' was way too big and fragile.  Its running
 +	time was very long.  It also produced a log that was nearly
 +	unreadable due to its length, making it very difficult to find
 +	out the reason for failures.
 +	Also, it was too much monolithic, with a single (maybe spurious)
 +	failure in a corner case causing the whole test to fail (even if
 +	everything worked as expected in the other 99% of cases).
 +	The present change should solve these problems, by separating
 +	`instspc.test' into many smaller, self-contained, auto-generated
 +	tests.
 +	* tests/instspc.test: Removed.
 +	* tests/instspc-tests.sh: New script, fulfilling a double role:
 +	1. it generates a Makefile.am snippet `tests/instspc-tests.am',
 +	containing the definition of a list of new tests which will take
 +	over the older `instspc.test', and
 +	2. it is sourced by said generated tests with proper parameters
 +	pre-set, to run the "meat" of the checks.
 +	This apparent abuse is indeed required because the test generation
 +	code and test execution code are inevitably intertwined.
 +	* tests/Makefile.am ($(srcdir)/instspc-tests.am): Include this
 +	snippet, which (among the other things) defines ...
 +	(instspc_tests): ... this new macro, containing the list of the
 +	newly generated `instspc*.test' tests, and ...
 +	(instspc_xfail_tests): ... this new macro, containing the list
 +	of the `instspc*.test' tests expected to fail.
 +	($(instspc_tests)): New rule, generates the `instspc*.test' tests.
 +	($(instspc_tests:.test=.log)): New rule, registers the dependency
 +	of all `instspc*.test' tests on the `instspc-tests.sh' script.
 +	(TESTS): Add `$(instspc_tests)', remove `instspc.test'.
 +	(XFAIL_TESTS): Add `$(xfail_instspc_tests)'.
 +	(EXTRA_DIST): Distribute instspc-tests.sh.
 +	(MAINTAINERCLEANFILES): Added $(instspc_tests).
 +	Other minor cosmetic changes.
 +	* bootstrap: Generate instspc-tests.am.
 +	* tests/.gitignore: Updated.
 +
  2010-11-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
  	Add FAQ entry for bug reporting instructions.
diff --cc automake.in
index ef9b511d9,8f3edded1..db45e5243
mode 100644,100755..100644
--- a/automake.in
+++ b/automake.in