From: Stefano Lattarini Date: Wed, 28 Dec 2011 09:54:47 +0000 (+0100) Subject: Merge branch 'maint' into silent-fixes X-Git-Tag: v1.11.2b~13^2~5^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c87ceb55d579658ff47f1d99dfc23ca985fc1cd6;p=thirdparty%2Fautomake.git Merge branch 'maint' into silent-fixes * maint: maint: autogenerate ChangeLog fix: last ChangeLog entry tests: drop unnecessary requirement in 'subpkg.test' gitlog-to-changelog: new auxiliary script, synced from gnulib docs: "aclocal --install -I /abs/dir" actually copies files docs: fix node names for automake and aclocal invocations --- c87ceb55d579658ff47f1d99dfc23ca985fc1cd6 diff --cc ChangeLog.11 index 475724305,0c37e166f..234bf2f07 --- a/ChangeLog.11 +++ b/ChangeLog.11 @@@ -1,66 -1,77 +1,140 @@@ + 2011-12-27 Stefano Lattarini + + tests: drop unnecessary requirement in 'subpkg.test' + * tests/subpkg.test ($required): Drop "bison", it is not required + anymore since commit `v1.11-502-g7e5ae80'. + + 2011-12-27 Stefano Lattarini + + gitlog-to-changelog: new auxiliary script, synced from gnulib + + We have plans to stop maintaining a version-controlled ChangeLog + file in the Automake repository, and instead begin to generate it + automatically from the git log messages. To do so, we will use + the `gitlog-to-changelog' script from gnulib. + + * lib/gitlog-to-changelog: New, synced from gnulib. + * Makefile.am (fetch): Fetch and sync it. + * lib/Makefile.am (EXTRA_DIST): Distribute it. + + 2011-12-27 Stefano Lattarini + + docs: "aclocal --install -I /abs/dir" actually copies files + + This change is for automake bug#8407. + + In the past, there had been some debate and confusion about + whether "aclocal --install" should copy third-party .m4 files + in the first directory passed to the `-I' option even when + such directory was given as an absolute path, or whether it + was better to do so only for directories specified with a + relative path. + + The rationale for this latter behaviour was that, before the + existence of the `ACLOCAL_PATH' variable, the only way (a poor + way, I might add) for a common user to extend the search path + of a system-wide installation of aclocal was to export something + like ACLOCAL="aclocal -I /my/extra/macros" in the environment. + Today, the correct way to proceed is undoubtedly through the + use of ACLOCAL_PATH, so we can settle the question once and for + all, and start verifying the correct behaviour of `-I' with a + new test. + + * tests/aclocal-install-absdir.test: New test. + * tests/Makefile.am (TESTS): Add it. + * doc/automake.texi (aclocal Options): Be more explicit about + this part of `--install' semantics. + + 2011-12-26 Stefano Lattarini + + docs: fix node names for automake and aclocal invocations + + With the older node names, an "info automake" command issued + from the command line would have opened the node about the + invocation of the automake program, rather than the Top node + of the automake documentation. To invoke the Top node, one + had to issue the command "info Automake" instead (note the + different capitalization). This was suboptimal, and certainly + confusing. + + With this change, "info automake" will open the Top node of the + automake documentation; to access the nodes about the invocation + of the automake and aclocal program, one has now to issue "info + automake-invocation" and "info aclocal-invocation" respectively. + + This change fixes automake bug#8071. + + See also commits `v2.61a-22-ge9215d1' and `v2.61a-72-g8c07b48' in + the autoconf git repository, which tackled a similar issue. + + * doc/automake.texi (@direntry): Rename nodes `aclocal' and + `automake' to `aclocal-invocation' and `automake-invocation' + respectively. + * NEWS: Update. + +2011-12-26 Stefano Lattarini + + tests: tweak tests on silent-rules for makes without nested vars + * tests/silent-nested-vars.test: Define $MAKE to `./mymake' in + the environment, so that it will be automatically picked up by + configure. Related tweaks and simplifications. + Remove the checks verifying that silent rules are respected also + when the 'subdir-objects' option is set, the checks testing the + old syntax for user-defined silent rules, and the tests using + the default $MAKE programs: they are redundant w.r.t. other test + cases. Related simplifications. + Remove the temporary files used in a sanity check as soon as they + are not needed anymore. + Do not capture also the standard error of configure: we only want + to grep its standard output. + Consistently use `stdout' for the name of files where to save the + standard output captured from make and configure, for consistency + with other tests. + Make grepping of configure output and of the generated Makefile + stricter. + Improve and tweak the `mymake' script a little. + * tests/silent6.test: Make grepping of make stdout slightly + stricter. After having configured with silent rules disabled, + try to force the use silent rules with `make V=1'. + +2011-12-25 Paul Eggert + + silent-rules: fallback for makes without nested vars + + This fixes two problems reported for Automake (Bug#9928, Bug#10237) + and is in response to a bug report for building coreutils on HP + NonStop OS (Bug#10234). The problem is that HP NonStop 'make' + treats a line like "AM_V_CC = $(am__v_CC_$(V))" as one that + expands a macro with the funny name am__v_CC_$(V instead of the + desired name am__v_CC_1 or am__v_CC_0, and since the funny macro + is not defined the line is equivalent to "AM_V_CC = )"; this + inserts a stray ")" when $(AM_V_CC) is used, which eventually + causes 'make' to fail. + + The basic idea is that instead of generating Makefile.in lines like + "AM_V_CC = $(am__v_CC_$(V))", we generate + "AM_V_CC = $(am__v_CC_@AM_V@)". We then AC_SUBST $(V) for @AM_V@ + in the usual case where `make' supports nested variables, + and substitute 1 (or 0) otherwise. Similarly for usages like + $(am__v_CC_$(AM_DEFAULT_VERBOSITY)). + + With this change, make implementations that doesn't grasp nested + variable expansions will still be able to run Makefiles generated + using the silent-rules option. They won't allow the user to + override the make verbosity at runtime through redefinition of + $(V) (as in "make V=0"); but this is still an improvement over not + being able to work at all. + + * NEWS: Document this. + * automake.in (define_verbose_var): When defining the variables, + use @AM_V@ rather than $(V), and use @AM_DEFAULT_V@ rather than + $(AM_DEFAULT_VERBOSITY). + * doc/automake.texi (Automake silent-rules Option): Explain new system. + * m4/silent.m4 (AM_SILENT_RULES): Check whether `make' supports + nested variables, and substitute AM_V and AM_DEFAULT_V accordingly. + * tests/silent-nested-vars.test: New test. + * tests/Makefile.am (TESTS): Add it. + 2011-12-24 Stefano Lattarini gitignore: use only one .gitignore file, in the top-level directory