diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-21 12:23:24 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-21 12:23:24 -0800 |
| commit | 925e561d3257c74833d68b809ff3dc0d96f284a5 (patch) | |
| tree | 32c1e17a4025e5cdcb6132eecd75c4da125cd7b4 /Makefile.in | |
| parent | e425f18bb685034efecf651c012fcb92bbb5e6be (diff) | |
| download | emacs-925e561d3257c74833d68b809ff3dc0d96f284a5.tar.gz | |
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.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 81a7404a9cc..3d8f6303e10 100644 --- a/Makefile.in +++ b/Makefile.in @@ -260,7 +260,7 @@ EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'` # 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 @@ $(srcdir)/aclocal.m4: $(ACLOCAL_INPUTS) 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 @@ dist: .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) |