aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2011-01-17 21:23:52 -0800
committerPaul Eggert2011-01-17 21:23:52 -0800
commit53911e8f4ea67606560debaa1590be06458d283f (patch)
treeb9a504ac8c64a19eb235a79dd3ab0d0155c1c6ba
parent7cae64b4eed192a49ea258089639ec44da6095e2 (diff)
downloademacs-53911e8f4ea67606560debaa1590be06458d283f.tar.gz
emacs-53911e8f4ea67606560debaa1590be06458d283f.zip
Minor cleanups for 'bzr status'
* .bzrignore: Add emacs-*/, the output of make-dist, and stamp-h1, the output of config.guess. * Makefile.in (top_distclean): Remove stamp-h1 too.
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.in2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index b75ef310f78..f365153c63b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
12011-01-18 Paul Eggert <eggert@cs.ucla.edu> 12011-01-18 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 Minor cleanups for 'bzr status'
4 * .bzrignore: Add emacs-*/, the output of make-dist, and stamp-h1,
5 the output of config.guess.
6 * Makefile.in (top_distclean): Remove stamp-h1 too.
7
3 * configure.in (HAVE_ATTRIBUTE_ALIGNED): Arrange for this to be 8 * configure.in (HAVE_ATTRIBUTE_ALIGNED): Arrange for this to be
4 defined if the compiler supports GCC-style __attribute__ 9 defined if the compiler supports GCC-style __attribute__
5 ((__aligned__ ...)). IBM AIX and Oracle Solaris Studio support 10 ((__aligned__ ...)). IBM AIX and Oracle Solaris Studio support
diff --git a/Makefile.in b/Makefile.in
index 13ecb64d684..7edb0843478 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -787,7 +787,7 @@ top_bootclean=\
787### distribution. 787### distribution.
788top_distclean=\ 788top_distclean=\
789 ${top_bootclean}; \ 789 ${top_bootclean}; \
790 rm -f config.status Makefile ${SUBDIR_MAKEFILES} 790 rm -f config.status Makefile stamp-h1 ${SUBDIR_MAKEFILES}
791distclean: FRC 791distclean: FRC
792 (cd src; $(MAKE) $(MFLAGS) distclean) 792 (cd src; $(MAKE) $(MFLAGS) distclean)
793 (cd oldXMenu; $(MAKE) $(MFLAGS) distclean) 793 (cd oldXMenu; $(MAKE) $(MFLAGS) distclean)