From: Stefano Lattarini Date: Fri, 7 Jan 2011 21:01:20 +0000 (+0100) Subject: Merge branch 'yacc-clean' X-Git-Tag: v1.11b~446 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a297a16568c8749e770b50a8910ab833d2837592;p=platform%2Fupstream%2Fautomake.git Merge branch 'yacc-clean' --- a297a16568c8749e770b50a8910ab833d2837592 diff --cc ChangeLog index 496e1cd,2482bbf..79bdc3f --- a/ChangeLog +++ b/ChangeLog @@@ -1,37 -1,35 +1,69 @@@ + 2011-01-07 Stefano Lattarini + + 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 + + * NEWS: Fix typo (forgotten word). + + 2011-01-02 Stefano Lattarini + Ralf Wildenhues + + docs: how to work around checks on invalid primary/directory couples + * doc/automake.texi (Uniform): Document the blessed idiom which can + be used to work around automake checks on invalid primary/directory + couples (such as `lib_PROGRAMS' or `doc_LIBRARIES'). + +2010-01-03 Stefano Lattarini + + Tests: normalize use of the 'errexit' shell flag. + * tests/maken3.test (check_targets): Remove redundant call to + 'set -e'. + * tests/maken4.test: Likewise. + * tests/ansi5.test: Call 'set -e' just after './defs' has been + sourced. + * tests/ansi6.test: Likewise. + * tests/ansi7.test: Likewise. + * tests/cond16.test: Likewise. + * tests/cond17.test: Likewise. + * tests/cond18.test: Likewise. + * tests/cond19.test: Likewise. + * tests/cond20.test: Likewise. + * tests/cond21.test: Likewise. + * tests/instdat2.test: Likewise. + * tests/instdir-texi.test: Likewise. + * tests/parallel-tests3.test: Likewise. + * tests/remake1a.test: Likewise. + * tests/ccnoco.test: Likewise, and add trailing `:' command. + * tests/comment4.test: Likewise. + * tests/gcj4.test: Likewise. + * tests/nodist2.test: Likewise. + * tests/nodist3.test: Enable 'errexit' shell flag (this should + have been done in commit v1.11-248-g317e17b, but the relevant + hunk has been forgotten somehow). + * tests/output.test: Likewise. + * tests/gnits2.test: Likewise, and display captured stderr to + script's stderr, not to script's stdout. + * tests/gnits3.test: Likewise. Also, prefer 'cat' over 'echo' + to append to Makefile.am, and really check that the exit status + of "make installcheck" indicates failure. + 2011-01-02 Ralf Wildenhues Sync auxiliary files from upstream. diff --cc NEWS index a7c5914,0575935..e83fd2b --- a/NEWS +++ b/NEWS @@@ -18,32 -5,10 +18,35 @@@ New in 1.11a - The `lzma' compression scheme and associated automake option `dist-lzma' is obsoleted by `xz' and `dist-xz' due to upstream changes. + - "make dist" can now create lzip-compressed tarballs. + + - You may adjust the compression options used in dist-xz and dist-bzip2. + The default is still -9 for each, but you may specify a different + level via the XZ_OPT and BZIP2 envvars respectively. E.g., + "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5" + + - Messages of types warning or error from `automake' and `aclocal' are now + prefixed with the respective type, and presence of -Werror is noted. + + - The `compile' script now converts some options for MSVC for a better + user experience. Similarly, the new `ar-lib' script wraps Microsoft lib. + + - Automake's early configure-time sanity check now tries to avoid sleeping + for a second, which slowed down cached configure runs noticeably. In that + case, it will check back at the end of the configure script to ensure that + at least one second has passed, to avoid time stamp issues with makefile + rules rerunning autotools programs. + + - For programs and libraries, automake now detects EXTRA_foo_DEPENDENCIES and + adds them to the normal list of dependencies, but without overwriting the + foo_DEPENDENCIES variable, which is normally computed by automake. + + - C source and header files derived from non-distributed Yacc sources are + now removed by "make clean", not only by "make maintainer-clean". + -Bugs fixed in 1.11.0a: +Bugs fixed in 1.11a: + + - Lots of minor bugfixes. * Bugs introduced by 1.11: diff --cc automake.in index 57edd04,b97d4a6..7737ff0 mode 100644,100755..100644 --- a/automake.in +++ b/automake.in diff --cc tests/Makefile.am index ea0b64a,bed5e41..5ec73d0 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@@ -937,7 -793,7 +937,8 @@@ werror4.test whoami.test \ xsource.test \ xz.test \ +yacc-basic.test \ + yacc-clean.test \ yacc.test \ yacc2.test \ yacc3.test \ diff --cc tests/Makefile.in index 9e78c97,77e9a38..2b73372 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@@ -1200,7 -1060,7 +1200,8 @@@ werror4.test whoami.test \ xsource.test \ xz.test \ +yacc-basic.test \ + yacc-clean.test \ yacc.test \ yacc2.test \ yacc3.test \