]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'yacc-work'
authorStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 9 Jan 2011 15:20:34 +0000 (16:20 +0100)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Sun, 9 Jan 2011 15:20:34 +0000 (16:20 +0100)
1  2 
ChangeLog
NEWS
automake.in
tests/Makefile.am
tests/Makefile.in

diff --cc ChangeLog
index d9104b85162d505c3d817254946450a603652e4a,06f9b8454d23bcaee7181dc227e30258d0cf7488..537344dbfa2df304d71b4941a4a21fbb48e133aa
+++ b/ChangeLog
+ 2011-01-08   Stefano Lattarini  <stefano.lattarini@gmail.com>
+       yacc: support variable expansions in *YFLAGS definition.
+       This change fixes automake bug#7800.
+       * automake.in (lang_yacc_target_hook): Use 'value_as_list_recursive'
+       instead of 'variable_value' to get the value of *YFLAGS variables.
+       Related changes.
+       ($DASH_D_PATTERN): Removed.
+       * tests/Makefile.am (XFAIL_TESTS): Remove yflags-var-expand.test.
+       * tests/yacc-clean.test: Remove workaround for now-fixed bug.
+       * NEWS: Update.
+ 2011-01-08   Stefano Lattarini  <stefano.lattarini@gmail.com>
+       yacc: more tests on *YFLAGS support
+       * tests/yflags-var-expand.test: New test, still xfailing.  It
+       exposes automake bug#7800 -- "automake fails to honor `-d' in
+       AM_YFLAGS when variable expansions are involved".
+       * tests/yflags-d-false-positive.test: New test, checking that
+       automake do not spuriously see `-d' in *YFLAGS when that isn't
+       really there.
+       * tests/yflags-force-override.test: New test, checking that
+       automake can cope with definition of the YFLAGS variable in
+       Makefile.am (even if that is an extremely bad practice, as that
+       variable is user-reserved).
+       * tests/yflags-cmdline-override.test: New test, checking that
+       automake can cope with user-redefinition of YFLAGS at configure
+       time and/or at make time.
+       * tests/yflags-conditional.test: New test, checks that automake
+       warns on conditionally-defined *YFLAGS variables.
+       * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
+ 2011-01-08   Stefano Lattarini  <stefano.lattarini@gmail.com>
+       yacc: extend and improve tests
+       * tests/yacc-basic.test: Also check that the intermediate C file
+       is mentioned in the generated Makefile.in, and that it is created
+       by the first make invocation.
+       * tests/yacc3.test: Test removed, superseded by ...
+       * tests/yacc-d-basic.test: ... this new test.
+       * tests/yacc2.test: Add reference to that new test in the heading
+       comments.
+       * tests/yacc-d-vpath.test: New test.
+       * tests/yaccvpath.test: Updated heading comments.  Do not require
+       gcc anymore, as any working C compiler should be enough.  Remove
+       redundant comments.
+       * tests/yacc-nodist.test: New test.
+       * tests/yacc-dist-nobuild.test: New test.
+       * tests/Makefile.am (TESTS): Update.
+ 2010-12-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
+       Extend, fix and improve tests on Lex and Yacc support.
+       * tests/lexcpp.test: New test script, on support for Lex + C++.
+       * tests/lexvpath.test: New test script, test build and rebuild
+       rules for lexers in VPATH setup.
+       * tests/yacc-basic.test: New test script, run simple "semantic"
+       checks on basic Yacc support (similarly to what lex3.test does
+       for Lex support).
+       * tests/lex.test: Don't create useless dummy source file joe.l.
+       Remove extra blank lines.
+       * tests/lex4.test: Add trailing `:' command.  Do not create dummy
+       useless lex source file.
+       * tests/lex2.test: Likewise.  Call automake with the `-a' option,
+       so that it doesn't fail for the absence of `ylwrap' script.  Make
+       grepping of automake stderr stricter.
+       * tests/yacc7.test: Add trailing `:' command.  Enable `errexit'
+       shell flag earlier (just after having sourced ./defs).
+       * tests/yacc4.test: Likewise.  Also ...
+       (configure.in): Use pre-populated skeleton set up by ./defs,
+       instead of writing one from scratch.
+       Other minor cosmetic changes.
+       * tests/yacc5.test: Likewise.
+       * tests/yaccvpath.test: Likewise. Also ...
+       ($distdir): New variable.
+       Use it throughout.
+       * tests/lex5.test: Likewise.
+       * tests/lex3.test: Likewise.  Check the distdir, rather than
+       grepping the distribution tarball.  Extend the test on the
+       created binary, and be sure to avoid hangs.  Add some comments.
+       * tests/yacc.test: Use stricter grepping.  Add trailing `:'.
+       * tests/yacc6.test: Likewise.
+       * tests/yacc3.test: Likewise.  Do not create the unused file
+       `Makefile.sed'.  Remove useless rules from Makefile.am.  Other
+       minor cosmetic changes.
+       * tests/yacc2.test: Make grepping of generated `Makefile.in' and
+       of automake error messages stricter.  Do not redirect output of
+       grep to /dev/null.  Move call to aclocal earlier.  Reduce the
+       number of empty blank lines.  Fix a typo in comments.
+       * tests/yacc8.test: Fixed bugs that reduced the completeness of
+       the tests.  Added trailing `:' command.
+       (configure.in): Use pre-populated skeleton set up by ./defs,
+       instead of writing one from scratch.
+       * tests/yaccpp.test: Test also extensions `.y++', `.ypp', and
+       `.yxx', rather than only `.yy'.
+       * tests/Makefile.am (TESTS): Update.
 +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/libobj17.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
        * doc/automake.texi (Uniform): List `LTLIBRARIES' among
        the Automake primaries.
  
- 2010-12-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
-       Extend, fix and improve tests on Lex and Yacc support.
-       * tests/lexcpp.test: New test script, on support for Lex + C++.
-       * tests/lexvpath.test: New test script, test build and rebuild
-       rules for lexers in VPATH setup.
-       * tests/yacc-basic.test: New test script, run simple "semantic"
-       checks on basic Yacc support (similarly to what lex3.test does
-       for Lex support).
-       * tests/lex.test: Don't create useless dummy source file joe.l.
-       Remove extra blank lines.
-       * tests/lex4.test: Add trailing `:' command.  Do not create dummy
-       useless lex source file.
-       * tests/lex2.test: Likewise.  Call automake with the `-a' option,
-       so that it doesn't fail for the absence of `ylwrap' script.  Make
-       grepping of automake stderr stricter.
-       * tests/yacc7.test: Add trailing `:' command.  Enable `errexit'
-       shell flag earlier (just after having sourced ./defs).
-       * tests/yacc4.test: Likewise.  Also ...
-       (configure.in): Use pre-populated skeleton set up by ./defs,
-       instead of writing one from scratch.
-       Other minor cosmetic changes.
-       * tests/yacc5.test: Likewise.
-       * tests/yaccvpath.test: Likewise. Also ...
-       ($distdir): New variable.
-       Use it throughout.
-       * tests/lex5.test: Likewise.
-       * tests/lex3.test: Likewise.  Check the distdir, rather than
-       grepping the distribution tarball.  Extend the test on the
-       created binary, and be sure to avoid hangs.  Add some comments.
-       * tests/yacc.test: Use stricter grepping.  Add trailing `:'.
-       * tests/yacc6.test: Likewise.
-       * tests/yacc3.test: Likewise.  Do not create the unused file
-       `Makefile.sed'.  Remove useless rules from Makefile.am.  Other
-       minor cosmetic changes.
-       * tests/yacc2.test: Make grepping of generated `Makefile.in' and
-       of automake error messages stricter.  Do not redirect output of
-       grep to /dev/null.  Move call to aclocal earlier.  Reduce the
-       number of empty blank lines.  Fix a typo in comments.
-       * tests/yacc8.test: Fixed bugs that reduced the completeness of
-       the tests.  Added trailing `:' command.
-       (configure.in): Use pre-populated skeleton set up by ./defs,
-       instead of writing one from scratch.
-       * tests/yaccpp.test: Test also extensions `.y++', `.ypp', and
-       `.yxx', rather than only `.yy'.
-       * tests/Makefile.am (TESTS): Update.
 +2010-12-13  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +          Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Tests defs: requirement 'xsi-shell' must be synced with libtool.
 +      * tests/defs (xsi-shell): Add comment telling to keep the
 +      XSI-conformance checks in sync with libtool.
 +
 +2010-12-17  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      Minor cleanups in canon7.test.
 +      * tests/canon7.test (_foo_bar_SOURCES): Remove libs.c.
 +      (configure.in): Remove AC_PROG_CXX.
 +
 +2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Avoid false positive in sc_tests_plain_make maintainer-check.
 +      * Makefile.am (sc_tests_plain_make): Ensure to only match full
 +      `make' words.  Avoid false positive with remake11.test.
 +
 +2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix canon7.test failure.
 +      * tests/canon7.test (_foo_bar_SOURCES): Add foobar.c.
 +      (lib.h, libd.c, libs.c): Use const for constant strings.
 +
 +2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 +
 +      Fix typos in test comments.
 +      * tests/posixsubst-data.test, tests/posixsubst-extradist.test,
 +      tests/posixsubst-ldadd.test, tests/posixsubst-libraries.test,
 +      tests/posixsubst-ltlibraries.test, tests/posixsubst-programs.test,
 +      tests/posixsubst-scripts.test, tests/posixsubst-sources.test,
 +      tests/posixsubst-tests.test: Fix typos.
 +
 +2010-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
 +
 +      More uses of AS_HELP_STRING in automake macros.
 +      * m4/depend.m4 (AM_DEP_TRACK): Use `AS_HELP_STRING' to format
 +      the help message added to the generated configure.
 +      * m4/dmalloc.m4 (AM_WITH_DMALLOC): Likewise.
 +      * m4/lispdir.m4 (AM_PATH_LISPDIR): Likewise.
 +      * m4/maintainer.m4 (AM_MAINTAINER_MODE): Likewise.
 +      * m4/multi.m4 (AM_ENABLE_MULTILIB): Likewise.
 +      Also, bumped all serial numbers of the modified m4 files.
 +
  2010-12-14  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        Improve tests on generated portions of configure help screen.
diff --cc NEWS
Simple merge
diff --cc automake.in
index bdbb4f0866364823175e75777d780b20a112c8e5,2bffe4814fea997b14fadeccac4f4dee173a98cb..3403c9668286b633d4656ebbea7ed2d3daed2f10
mode 100644,100755..100644
index 5ec73d00786646317b511a778b1a235252b9b99b,bb1d786b56858e1720d16052d905bd1013bb3f84..56253def78ea95d381428863a69772c7193adab7
@@@ -948,17 -806,24 +948,25 @@@ yacc6.test 
  yacc7.test \
  yacc8.test \
  yaccdry.test \
+ yacc-dist-nobuild.test \
+ yacc-nodist.test \
  yaccpp.test \
  yaccvpath.test \
+ yacc-d-vpath.test \
  yflags.test \
  yflags2.test \
+ yflags-cmdline-override.test \
+ yflags-conditional.test \
+ yflags-d-false-positives.test \
+ yflags-force-override.test \
+ yflags-var-expand.test \
  $(parallel_tests)
  
 -EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
 +EXTRA_DIST += $(TESTS)
 +
  
  # Each test case depends on defs, aclocal, and automake.
 -check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
 +$(TEST_LOGS): defs aclocal-$(APIVERSION) automake-$(APIVERSION)
  
  clean-local: clean-local-check
  .PHONY: clean-local-check
index 2b73372cd47afa4d6761ca15e1a572b9efd93729,e83cf33444fa51239cc24137321c05d48d5d7778..58004e739de0826ec8f8563c713cfdb6a9d6326f
@@@ -1211,12 -1073,24 +1211,20 @@@ yacc6.test 
  yacc7.test \
  yacc8.test \
  yaccdry.test \
+ yacc-dist-nobuild.test \
+ yacc-nodist.test \
  yaccpp.test \
  yaccvpath.test \
+ yacc-d-vpath.test \
  yflags.test \
  yflags2.test \
+ yflags-cmdline-override.test \
+ yflags-conditional.test \
+ yflags-d-false-positives.test \
+ yflags-force-override.test \
+ yflags-var-expand.test \
  $(parallel_tests)
  
 -EXTRA_DIST = ChangeLog-old gen-parallel-tests $(TESTS)
 -
 -# Each test case depends on defs, aclocal, and automake.
 -check_SCRIPTS = defs aclocal-$(APIVERSION) automake-$(APIVERSION)
  all: all-am
  
  .SUFFIXES: