From: Stefano Lattarini Date: Wed, 1 Jun 2011 16:58:35 +0000 (+0200) Subject: Merge branch 'remake-rules-non-GNU-make' into maint X-Git-Tag: ng-0.5a~172^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67ca6940688ed14d84642b34df4f28a07b9d9f00;p=thirdparty%2Fautomake.git Merge branch 'remake-rules-non-GNU-make' into maint --- 67ca6940688ed14d84642b34df4f28a07b9d9f00 diff --cc ChangeLog index cd0f593c5,9c9b2561a..fd1312eea --- a/ChangeLog +++ b/ChangeLog @@@ -1,53 -1,20 +1,70 @@@ + 2011-05-29 Stefano Lattarini + + remake: behave better with non-GNU make in subdirectories + Currently, with every decent make program, it is possible to + rebuild out-of-date autotools-generated files with a simple + "make Makefile" -- but for this to work reliably with non-GNU + make implementations, the command must be issued from the + top-level directory. This patch removes such limitation. + * lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'. + * tests/defs.in (using_gmake): New function, backported from the + `master' branch (and simplified). + * tests/remake-subdir.test: New test. + * tests/remake-subdir2.test: Likewise. + * tests/remake-subdir-gnu.test: Likewise. + * tests/remake-subdir-from-subdir.test: Likewise. + * tests/Makefile.am (TESTS): Update. + +2011-05-29 Stefano Lattarini + + automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE + Currently, the Automake's own configure script allow definition + of AUTOCONF and AUTOM4TE, expected to point respectively to an + autoconf and autom4te programs. But while these definitions are + honoured in the Automake's build systems and test suite, they + were *not* honoured in the generated `automake' and `aclocal' + scripts. This behaviour, apart from being wrong in that it does + not allow the user enough freedom in choosing his tools, also + caused inconsistencies in the test suite, brining to spurious + failures. + Problem reported by Graham Reitz on the automake list; see thread: + + * automake.in ($traces): Use `@am_AUTOCONF', not simply `autoconf'. + * aclocal.in ($traces): Use `@am_AUTOM4TE', not simply `autom4te'. + * Makefile.am (do_subst): Substitute also `@am_AUTOCONF' and + `@am_AUTOM4TE'. + * NEWS: Update. + * THANKS: Update. + +2011-05-29 Stefano Lattarini + + build: the user can override AUTOM4TE, AUTORECONF and AUTOUPDATE too + Our build system allows the user to override AUTOCONF and AUTOHEADER + at configure time, and honours these overrides in our testsuite. + But it didn't do the same with AUTOM4TE, AUTORECONF and AUTOUPDATE. + This change fixes that inconsistency. + * configure.ac (am_AUTOM4TE, am_AUTOUPDATE, am_AUTORECONF): New + AC_SUBSTitutions. Update comments. + * tests/defs.in ($AUTOUPDATE): Default to `@am_AUTOUPDATE@' now. + ($AUTOM4TE): New variable, defaulting to `@am_AUTOM4TE@'. + ($AUTORECONF): New variable, defaulting to `@am_AUTORECONF@'. + * doc/Makefile.am ($(srcdir)/amhello-1.0.tar.gz): Update. + +2011-05-22 Ralf Wildenhues + Stefano Lattarini + + tests/README: fix example about `make -e' usage + * tests/README (Section "Writing test cases" subsection "Do"): When + some variable is never initialized in the Makefile, `-e' is not + necessary in order to override it. DESTDIR is such a variable: we + ensure that we do not ever initialize it. And as such, it is quite + portable to use: + $ make DESTDIR=/foo/bar install + and in fact, quite widely used. + So our example about when `make -e' is required, which references + the `DESTDIR' variable, is poorly chosen, if not downright wrong. + Rewrite it to use `prefix' as the overridden variable instead. + 2011-05-20 Stefano Lattarini testsuite: avoid re-running few tests with 'parallel-tests' option