Mercurial > emacs
comparison Makefile.in @ 112399:51005885fe39
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.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Fri, 21 Jan 2011 12:23:24 -0800 |
parents | 75fec4affb13 |
children | 647e164c1f3e |
comparison
equal
deleted
inserted
replaced
112398:0bfcbd0b704b | 112399:51005885fe39 |
---|---|
258 EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'` | 258 EMACSFULL = `echo emacs-${version}${EXEEXT} | sed '$(TRANSFORM)'` |
259 | 259 |
260 # Subdirectories to make recursively. `lisp' is not included | 260 # Subdirectories to make recursively. `lisp' is not included |
261 # because the compiled lisp files are part of the distribution. | 261 # because the compiled lisp files are part of the distribution. |
262 # leim is not included because it needs special handling. | 262 # leim is not included because it needs special handling. |
263 # | 263 # |
264 # Actually, we now include `lisp' as well, since the compiled files | 264 # Actually, we now include `lisp' as well, since the compiled files |
265 # are not included any more in case of bootstrap or in case Emacs was | 265 # are not included any more in case of bootstrap or in case Emacs was |
266 # checked out from a VCS. | 266 # checked out from a VCS. |
267 SUBDIR = lib lib-src src lisp | 267 SUBDIR = lib lib-src src lisp |
268 | 268 |
412 cd $(srcdir) && aclocal -I m4 | 412 cd $(srcdir) && aclocal -I m4 |
413 | 413 |
414 AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am | 414 AUTOMAKE_INPUTS = @MAINT@ $(srcdir)/aclocal.m4 $(srcdir)/lib/Makefile.am |
415 $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS) | 415 $(srcdir)/lib/Makefile.in: $(AUTOMAKE_INPUTS) |
416 cd $(srcdir) && automake --gnu -a -c lib/Makefile | 416 cd $(srcdir) && automake --gnu -a -c lib/Makefile |
417 am--refresh: | 417 am--refresh: $(srcdir)/aclocal.m4 $(srcdir)/configure $(srcdir)/src/config.in |
418 .PHONY: am--refresh | 418 .PHONY: am--refresh |
419 | 419 |
420 $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in | 420 $(srcdir)/src/config.in: $(srcdir)/src/stamp-h.in |
421 @ # Usually, there's no need to rebuild src/config.in just | 421 @ # Usually, there's no need to rebuild src/config.in just |
422 @ # because stamp-h.in has changed (since building stamp-h.in | 422 @ # because stamp-h.in has changed (since building stamp-h.in |
861 dist: | 861 dist: |
862 cd ${srcdir}; ./make-dist | 862 cd ${srcdir}; ./make-dist |
863 | 863 |
864 .PHONY: info dvi dist check html | 864 .PHONY: info dvi dist check html |
865 | 865 |
866 info-real: | 866 info-real: |
867 (cd doc/emacs; $(MAKE) $(MFLAGS) info) | 867 (cd doc/emacs; $(MAKE) $(MFLAGS) info) |
868 (cd doc/misc; $(MAKE) $(MFLAGS) info) | 868 (cd doc/misc; $(MAKE) $(MFLAGS) info) |
869 (cd doc/lispref; $(MAKE) $(MFLAGS) info) | 869 (cd doc/lispref; $(MAKE) $(MFLAGS) info) |
870 (cd doc/lispintro; $(MAKE) $(MFLAGS) info) | 870 (cd doc/lispintro; $(MAKE) $(MFLAGS) info) |
871 | 871 |