From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Sun, 3 Oct 2010 09:44:13 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~360
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6b05bd1bce89168db265d8464464562c54fa72e;p=thirdparty%2Fautomake.git

Merge branch 'maint'
---

f6b05bd1bce89168db265d8464464562c54fa72e
diff --cc ChangeLog
index 79b7d3930,209038198..b608c9449
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,42 -1,12 +1,51 @@@
+ 2010-10-03  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Document and fix expansion of variables before rules.
+ 	* doc/automake.texi (General Operation): Document that variables
+ 	are expanded before rules.
+ 	* lib/am/check.am (am__check_post): Reword a bit so it does not
+ 	get matched as a rule.
+ 	Suggestion by Ben Pfaff.
+ 
 +2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +	Coverage and minor fixes for variable typo detection.
 +	* automake.in (check_typos): Remove `EXTRA_' prefix when
 +	computing canonical name.
 +	* tests/vartypo2.test, tests/vartypos.test: New tests.
 +	* tests/Makefile.am (TESTS): Update.
 +
 +	Implement EXTRA_maude_DEPENDENCIES for programs and libraries.
 +	* automake.in (handle_programs, handle_libraries)
 +	(handle_ltlibraries): Mark EXTRA_*_DEPENDENCIES as recognized.
 +	* doc/automake.texi (Linking, Program and Library Variables)
 +	(LIBOBJS): Document EXTRA_*_DEPENDENCIES.
 +	* lib/am/library.am (%LIBRARY%): Also depend on
 +	$(EXTRA_%XLIBRARY%_DEPENDENCIES).
 +	* lib/am/ltlibrary.am (%LTLIBRARY%): Also depend on
 +	(%XLTLIBRARY%_DEPENDENCIES).
 +	* lib/am/program.am (%PROGRAM%%EXEEXT%): Also depend on
 +	$(EXTRA_%XPROGRAM%_DEPENDENCIES).
 +	* tests/extradep.test, tests/extradep2.test: New tests.
 +	* tests/Makefile.am (TESTS): Update.
 +	* NEWS: Update.
 +	Suggested by Eric Blake.
 +
 +	tests: avoid running into timing issues due to sanity change.
 +	* tests/acloca10.test, tests/acloca18.test, tests/aclocal9.test:
 +	Insert strategic sleep before aclocal reruns, to ensure files
 +	are newer.
 +	* tests/python11.test: Use --force for repeated autotools runs.
 +	Reports from the NixOS Hydra build daemon via Ludovic Courtès.
 +
 +	Fix timestamp issues by ensuring configure takes at least a second.
 +	* m4/sanity.m4 (AM_SANITY_CHECK): If we didn't sleep here,
 +	start a sleep in the background and wait for it to finish
 +	before creating config.status, hopefully fixing all spurious
 +	testsuite failures involving botched time stamps.
 +	* NEWS: Update.
 +	Reports by Ludovic Courtès, Peter Breitenlohner, and others.
 +
  2010-10-02  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
  
  	Revert "parallel-tests: avoid command-line length limit issue."
diff --cc lib/Automake/tests/Makefile.in
index 343cf0db7,816778812..dd5b61bfe
--- a/lib/Automake/tests/Makefile.in
+++ b/lib/Automake/tests/Makefile.in
@@@ -311,39 -319,7 +340,9 @@@ TAGS
  ctags: CTAGS
  CTAGS:
  
 +cscope cscopelist:
 +
  
- # To be appended to the command running the test.  Handle the stdout
- # and stderr redirection, and catch the exit status.
- am__check_post =					\
- >$@-t 2>&1;						\
- estatus=$$?;						\
- if test -n '$(DISABLE_HARD_ERRORS)'			\
-    && test $$estatus -eq 99; then			\
-   estatus=1;						\
- fi;							\
- TERM=$$__SAVED_TERM; export TERM;			\
- $(am__tty_colors);					\
- xfailed=PASS;						\
- case " $(XFAIL_TESTS) " in				\
-   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-     xfailed=XFAIL;;					\
- esac;							\
- case $$estatus:$$xfailed in				\
-     0:XFAIL) col=$$red; res=XPASS;;			\
-     0:*)     col=$$grn; res=PASS ;;			\
-     77:*)    col=$$blu; res=SKIP ;;			\
-     99:*)    col=$$red; res=FAIL ;;			\
-     *:XFAIL) col=$$lgn; res=XFAIL;;			\
-     *:*)     col=$$red; res=FAIL ;;			\
- esac;							\
- echo "$${col}$$res$${std}: $$f";			\
- echo "$$res: $$f (exit: $$estatus)" |			\
-   $(am__rst_section) >$@;				\
- cat $@-t >>$@;						\
- rm -f $@-t
- 
  $(TEST_SUITE_LOG): $(TEST_LOGS)
  	@$(am__sh_e_setup);						\
  	list='$(TEST_LOGS)';						\
diff --cc tests/Makefile.in
index e1d72acb3,a9b1cbba5..6bb00dafe
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1092,39 -1110,7 +1121,9 @@@ TAGS
  ctags: CTAGS
  CTAGS:
  
 +cscope cscopelist:
 +
  
- # To be appended to the command running the test.  Handle the stdout
- # and stderr redirection, and catch the exit status.
- am__check_post =					\
- >$@-t 2>&1;						\
- estatus=$$?;						\
- if test -n '$(DISABLE_HARD_ERRORS)'			\
-    && test $$estatus -eq 99; then			\
-   estatus=1;						\
- fi;							\
- TERM=$$__SAVED_TERM; export TERM;			\
- $(am__tty_colors);					\
- xfailed=PASS;						\
- case " $(XFAIL_TESTS) " in				\
-   *[\ \	]$$f[\ \	]* | *[\ \	]$$dir$$f[\ \	]*) \
-     xfailed=XFAIL;;					\
- esac;							\
- case $$estatus:$$xfailed in				\
-     0:XFAIL) col=$$red; res=XPASS;;			\
-     0:*)     col=$$grn; res=PASS ;;			\
-     77:*)    col=$$blu; res=SKIP ;;			\
-     99:*)    col=$$red; res=FAIL ;;			\
-     *:XFAIL) col=$$lgn; res=XFAIL;;			\
-     *:*)     col=$$red; res=FAIL ;;			\
- esac;							\
- echo "$${col}$$res$${std}: $$f";			\
- echo "$$res: $$f (exit: $$estatus)" |			\
-   $(am__rst_section) >$@;				\
- cat $@-t >>$@;						\
- rm -f $@-t
- 
  $(TEST_SUITE_LOG): $(TEST_LOGS)
  	@$(am__sh_e_setup);						\
  	list='$(TEST_LOGS)';						\