From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 24 Jun 2010 19:33:09 +0000 (+0200)
Subject: Merge branch 'sl-yacc-work' into maint
X-Git-Tag: v1.11.1b~71^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2360b8785bfa80c1968193f6ab7137764c91572e;p=thirdparty%2Fautomake.git

Merge branch 'sl-yacc-work' into maint

* sl-yacc-work:
  Fix minor testsuite issues, update docs, for Yacc/Lex changes.
  Bugfix: $(AM_FLAGS)/$(FLAGS) precedence in Yacc/Lex.
  New tests, for bugs in Yacc/Lex AM_FLAGS and FLAGS precedence.
---

2360b8785bfa80c1968193f6ab7137764c91572e
diff --cc ChangeLog
index 1822ab648,98e5792cb..4bc154a40
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,37 +1,50 @@@
 +2010-06-24  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Fix bugs in test script silent5.test.
 +	* tests/silent5.test: Fixed a nasty bug (due to the use of grep
 +	instead of egrep) that could have led to false negatives.
 +
 +2010-06-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +	Add a test checking that distributed broken symlinks cause
 +	`make dist' to fail.
 +	* tests/distlinksbrk.test: New test.
 +	* tests/Makefile.am (TESTS): Updated.
 +
+ 2010-06-21  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+ 
+ 	Fix minor testsuite issues, update docs, for Yacc/Lex changes.
+ 	* doc/automake.texi (Yacc and Lex): Mention AM_YFLAGS, YFLAGS
+ 	and AM_LFLAGS, LFLAGS in the order in which they now appear in
+ 	the rules.
+ 	* NEWS: Update.
+ 	* tests/lflags.test, tests/lflags2.test, tests/yflags.test,
+ 	tests/yflags2.test: Prefer `make -e' over `make VAR=VAL', to
+ 	please maintainer-check.  Ensure generated C files contain a
+ 	declaration, to please compilers.
+ 
+ 2010-06-21  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+ 	Fix bugs in Automake Yacc/Lex support w.r.t. $(AM_FLAGS) and
+ 	$(FLAGS) precedence.
+ 	* automake.in: Fix registration of languages "Lex", "Lex (C++)",
+ 	"Yacc" and "Yacc (C++)", so that $(LFLAGS) has precedence over
+ 	$(AM_LFLAGS) and $(YFLAGS) has precedence over $(AM_YFLAGS).
+ 	* tests/Makefile.am (XFAIL_TESTS): Updated accordingly.
+ 	* NEWS: Updated.
+ 
+ 	New tests, exposing bugs in Automake Yacc/Lex support w.r.t.
+ 	$(AM_FLAGS) and $(FLAGS) precedence.
+ 	* tests/lflags.test: New test, check that user $(LFLAGS) takes
+ 	precedence over automake (AM_LFLAGS) and (foo_LFLAGS).  Still
+ 	xfailing.
+ 	* tests/lflags2.test: Likewise.
+ 	* tests/yflags.test: New test, check that user $(YFLAGS) takes
+ 	precedence over automake (AM_YFLAGS) and (foo_YFLAGS).  Still
+ 	xfailing.
+ 	* tests/yflags2.test: Likewise.
+ 	* tests/Makefile.am (TESTS, XFAIL_TESTS): Extended accordingly.
+ 
  2010-06-20  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
  	Modernize, improve and extend tests `suffix*.test'.