Mercurial > emacs
changeset 112400:c729a73f3e52
Merge: aclocal.m4: tweaks to regenerate more conveniently
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 21 Jan 2011 12:24:31 -0800 |
| parents | 0bfcbd0b704b (current diff) 51005885fe39 (diff) |
| children | e80422318be4 a102f5772eaa |
| files | |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.bzrignore Fri Jan 21 12:38:33 2011 -0500 +++ b/.bzrignore Fri Jan 21 12:24:31 2011 -0800 @@ -13,6 +13,7 @@ *.dSYM *.elc *.exe +aclocal.m4 autom4te.cache confdefs.h configure.lineno
--- a/ChangeLog Fri Jan 21 12:38:33 2011 -0500 +++ b/ChangeLog Fri Jan 21 12:24:31 2011 -0800 @@ -1,3 +1,11 @@ +2011-01-21 Paul Eggert <eggert@cs.ucla.edu> + + aclocal.m4: tweaks to regenerate more conveniently + This attempts to act better when the source is in a weird state. See + <http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00734.html>. + * Makefile.in (am--refresh): Add aclocal.m4, configure, config.in. + * .bzrignore: Add aclocal.m4. + 2011-01-20 Paul Eggert <eggert@cs.ucla.edu> aclocal.m4: omit auto-generated file from repository
--- a/Makefile.in Fri Jan 21 12:38:33 2011 -0500 +++ b/Makefile.in Fri Jan 21 12:24:31 2011 -0800 @@ -260,7 +260,7 @@ # Subdirectories to make recursively. `lisp' is not included # because the compiled lisp files are part of the distribution. # leim is not included because it needs special handling. -# +# # Actually, we now include `lisp' as well, since the compiled files # are not included any more in case of bootstrap or in case Emacs was # checked out from a VCS. @@ -414,7 +414,7 @@ AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS) cd $(srcdir) && automake --gnu -a -c lib/Makefile -am--refresh: +am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in .PHONY: am--refresh $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in @@ -863,7 +863,7 @@ .PHONY: info dvi dist check html -info-real: +info-real: (cd doc/emacs; $(MAKE) $(MFLAGS) info) (cd doc/misc; $(MAKE) $(MFLAGS) info) (cd doc/lispref; $(MAKE) $(MFLAGS) info)