diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-17 11:33:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-03-17 11:42:34 -0700 |
| commit | 2f8935099c680f5e25afdf290d351180ee42fa39 (patch) | |
| tree | 900d6f682b94c4b5f5cfe435fd6910f6ad9b6b3e /autogen.sh | |
| parent | 65faa7bcb59421603ed2b6e961fe4b9ea8cb91b9 (diff) | |
| download | emacs-2f8935099c680f5e25afdf290d351180ee42fa39.tar.gz | |
Fixups for GNU Make switchover
This fixes some minor problems introduced in the recent switch to GNU
Make, discovered by further testing. Without some of these changes
'make -j' would sometimes have race conditions caused by missing
dependencies. (Bug#26100)
* .gitignore: Remove src/stamp-h.in, src/stamp-h1.
* Makefile.in ($(MAKEFILE_NAME)): Depend on configure, not
src/config.in, since the former's timestamp now represents
the latter's.
($(srcdir)/configure): Use plain ./autogen.sh, for consistency
with other autogen.sh invocations.
($(srcdir)/src/stamp-h.in):
Remove rule, as this file is no longer created.
* Makefile.in (top_distclean):
* src/Makefile.in (bootstrap-clean):
No need to remove stamp-h1, as that was an Automake byproduct
and Automake is no longer in use.
* lib/Makefile.in, src/Makefile.in:
(AUTOCONF_INPUTS, $(top_srcdir)/configure): Remove.
(../config.status, Makefile): Simplify by limiting dependencies
to files we care about and files in the repository, and by
using just one file to represent the timestamps on multiple
targets updated by the same rule.
* autogen.sh: Do not create or use src/stamp-h.in.
Instead, have 'find' test the two output files directly.
Diffstat (limited to 'autogen.sh')
| -rwxr-xr-x | autogen.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/autogen.sh b/autogen.sh index f8e71cb747a..2297bdc8c49 100755 --- a/autogen.sh +++ b/autogen.sh @@ -242,10 +242,6 @@ Please report any problems with this script to bug-gnu-emacs@gnu.org .' ## Let autoreconf figure out what, if anything, needs doing. ## Use autoreconf's -f option in case autoreconf itself has changed. autoreconf -fi -I m4 || exit - - ## Create a timestamp, so that './autogen.sh; make' doesn't - ## cause 'make' to needlessly run 'autoheader'. - echo timestamp > src/stamp-h.in || exit fi @@ -360,7 +356,7 @@ if test ! -f configure; then elif test -e .git && test $git_was_ok = false && test $do_git = false; then echo "You can now run '$0 git'." elif test ! -f config.status || - test -n "`find src/stamp-h.in -newer config.status`"; then + test -n "`find configure src/config.in -newer config.status`"; then echo "You can now run './configure'." fi |