(org-set-tags): Keep single space after stars.

[bpt/emacs.git] / lisp / Makefile.in

diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index eaac8d0..e90c616 100644 (file)
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,5 +1,6 @@
 # Maintenance productions for the Lisp directory
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -117,7 +118,10 @@ update-subdirs: doit
           $(srcdir)/update-subdirs $$file; \
        done;
 
-updates: update-subdirs autoloads mh-autoloads finder-data custom-deps
+updates: update-subdirs autoloads finder-data custom-deps
+
+# This is useful after "cvs up".
+cvs-update: recompile autoloads finder-data custom-deps
 
 # Update the AUTHORS file.
 
@@ -149,8 +153,10 @@ TAGS-LISP: $(lisptagsfiles1) $(lisptagsfiles2)
 # subdirectories, to make sure require's and load's in the files being
 # compiled find the right files.
 
+# `|| true' below prevents old Bash versions from getting confused
+# by an error.
 compile: $(lisp)/subdirs.el mh-autoloads doit
-       find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1; \
+       find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \
        wd=$(lisp); $(setwins); \
        els=`echo $$wins | tr ' \011' '\012\012' | \
                sed -e 's|\(.\)$$|\1/|' -e 's|^\./||' -e 's|$$|*.el|'`; \
@@ -166,7 +172,7 @@ compile: $(lisp)/subdirs.el mh-autoloads doit
 # unconditionally.  Some files don't actually get compiled because they
 # set the local variable no-byte-compile.
 
-compile-always: $(lisp)/subdirs.el doit
+compile-always: $(lisp)/subdirs.el mh-autoloads doit
        # `|| true' prevents old Bash versions from getting confused
        # by an error.
        find $(lisp) -name "*.elc" -print | xargs chmod +w >/dev/null 2>&1 || true; \
@@ -217,21 +223,25 @@ $(lisp)/progmodes/cc-mode.elc: \
 # Update MH-E internal autoloads. These are not to be confused with
 # the autoloads for the MH-E entry points, which are already in
 # loaddefs.el.
-MH-E-SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el   \
-       $(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-customize.el    \
-       $(lisp)/mh-e/mh-e.el $(lisp)/mh-e/mh-funcs.el           \
-       $(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-pick.el         \
-       $(lisp)/mh-e/mh-print.el $(lisp)/mh-e/mh-inc.el         \
-       $(lisp)/mh-e/mh-init.el $(lisp)/mh-e/mh-index.el        \
-       $(lisp)/mh-e/mh-identity.el $(lisp)/mh-e/mh-junk.el     \
-       $(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-speed.el         \
-       $(lisp)/mh-e/mh-utils.el
+MH_E_SRC = $(lisp)/mh-e/mh-acros.el $(lisp)/mh-e/mh-alias.el   \
+       $(lisp)/mh-e/mh-buffers.el $(lisp)/mh-e/mh-compat.el    \
+       $(lisp)/mh-e/mh-comp.el $(lisp)/mh-e/mh-e.el            \
+       $(lisp)/mh-e/mh-folder.el $(lisp)/mh-e/mh-funcs.el      \
+       $(lisp)/mh-e/mh-gnus.el $(lisp)/mh-e/mh-identity.el     \
+       $(lisp)/mh-e/mh-inc.el $(lisp)/mh-e/mh-junk.el          \
+       $(lisp)/mh-e/mh-letter.el $(lisp)/mh-e/mh-limit.el      \
+       $(lisp)/mh-e/mh-mime.el $(lisp)/mh-e/mh-print.el        \
+       $(lisp)/mh-e/mh-scan.el $(lisp)/mh-e/mh-search.el       \
+       $(lisp)/mh-e/mh-seq.el $(lisp)/mh-e/mh-show.el          \
+       $(lisp)/mh-e/mh-speed.el $(lisp)/mh-e/mh-thread.el      \
+       $(lisp)/mh-e/mh-tool-bar.el $(lisp)/mh-e/mh-utils.el    \
+       $(lisp)/mh-e/mh-xface.el
 
 mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
-$(lisp)/mh-e/mh-loaddefs.el: $(MH-E-SRC)
+$(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
        echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
-       echo ";;" >> $@
-       echo ";; Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc." >> $@
+       echo "" >> $@
+       echo ";; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc." >> $@
        echo ";; Author: Bill Wohler <wohler@newt.com>" >> $@
        echo ";; Keywords: mail" >> $@
        echo ";;; Commentary:" >> $@
@@ -280,7 +290,7 @@ bootstrap-clean:
 
 # Generate/update files for the bootstrap process.
 
-bootstrap: update-subdirs autoloads mh-autoloads compile
+bootstrap: update-subdirs autoloads compile
 
 # Generate/update files after the bootstrap process.
 # custom-deps needs `preloaded-file-list'.