diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-10-22 23:31:48 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-10-22 23:31:48 -0700 |
| commit | 285ac870226e2ecc565925013e9ae8e7fe2657c0 (patch) | |
| tree | 3a4d869355943a0d913786697562a19ede74e146 | |
| parent | 78b215ffea604d7d062b292ec1d04e31b7b4bd74 (diff) | |
| download | emacs-285ac870226e2ecc565925013e9ae8e7fe2657c0.tar.gz | |
* Makefile.in (ACLOCAL_INPUTS): Omit unnecessary use of 'wildcard'.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 534a34d103f..70cde66b9c7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,12 @@ 2014-10-23 Paul Eggert <eggert@cs.ucla.edu> + * Makefile.in (ACLOCAL_INPUTS): Omit unnecessary use of 'wildcard'. + Fix race in 'make info/dir', and speed it up. * Makefile.in (AWK, srcdir_doc_info_dir_inputs, info_dir_inputs): New macros. (clean): Remove info-dir.*. (info_dir_deps): Depend on make-info-dir too. - Fix bug with wildcards that weren't expanded. (${srcdir}/info/dir): Make sure info directory exists. Don't call pwd; just redirect make-info-dir's stdout to temp file. * build-aux/make-info-dir: Send output to stdout. diff --git a/Makefile.in b/Makefile.in index 57d97d7eafc..2f7294073b7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -417,7 +417,7 @@ $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && ${AUTOCONF} ACLOCAL_PATH = @ACLOCAL_PATH@ -ACLOCAL_INPUTS = $(srcdir)/configure.ac $(wildcard $(srcdir)/m4/*.m4) +ACLOCAL_INPUTS = $(srcdir)/configure.ac $(srcdir)/m4/*.m4 $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) cd $(srcdir) && ACLOCAL_PATH='$(ACLOCAL_PATH)' $(ACLOCAL) -I m4 diff --git a/src/ChangeLog b/src/ChangeLog index 91f910aa6f9..d74d2a4f092 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-10-23 Paul Eggert <eggert@cs.ucla.edu> + + * Makefile.in (ACLOCAL_INPUTS): Omit unnecessary use of 'wildcard'. + 2014-10-22 Eli Zaretskii <eliz@gnu.org> Optimize redisplay of simple bracketed text. diff --git a/src/Makefile.in b/src/Makefile.in index 36e145744b3..270119ee264 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -535,7 +535,7 @@ $(oldXMenudir)/libXMenu11.a: FORCE FORCE: .PHONY: FORCE -ACLOCAL_INPUTS = $(top_srcdir)/configure.ac $(wildcard $(top_srcdir)/m4/*.m4) +ACLOCAL_INPUTS = $(top_srcdir)/configure.ac $(top_srcdir)/m4/*.m4 AUTOCONF_INPUTS = $(top_srcdir)/configure.ac $(top_srcdir)/aclocal.m4 $(top_srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) $(top_srcdir)/configure config.in: $(AUTOCONF_INPUTS) |