[Emacs-diffs] /srv/bzr/emacs/trunk r102928: Merge: aclocal.m4: tweaks to regenerate more conveniently

[Paul Eggert]

------------------------------------------------------------
revno: 102928 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-01-21 12:24:31 -0800
message:
  Merge: aclocal.m4: tweaks to regenerate more conveniently
modified:
  .bzrignore
  ChangeLog
  Makefile.in

=== modified file '.bzrignore'
--- a/.bzrignore        2011-01-18 05:23:52 +0000
+++ b/.bzrignore        2011-01-21 20:23:24 +0000
@@ -13,6 +13,7 @@
 *.dSYM
 *.elc
 *.exe
+aclocal.m4
 autom4te.cache
 confdefs.h
 configure.lineno

=== modified file 'ChangeLog'
--- a/ChangeLog 2011-01-20 05:00:40 +0000
+++ b/ChangeLog 2011-01-21 20:23:24 +0000
@@ -1,3 +1,11 @@
+2011-01-21  Paul Eggert  <address@hidden>
+
+       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  <address@hidden>
 
        aclocal.m4: omit auto-generated file from repository

=== modified file 'Makefile.in'
--- a/Makefile.in       2011-01-20 05:00:40 +0000
+++ b/Makefile.in       2011-01-21 20:23:24 +0000
@@ -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)