* makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH):

  Don't copy ldefs-boot.el over loaddefs.el.
  (bootstrap-clean): Remove loaddefs.el and don't depend on it.
  (loaddefs.el-SH, loaddefs.el-CMD): Don't add autoloads and defvars
  to loaddefs.el; they are not needed now.  Add coding cookie.

2 files changed, 23 insertions, 31 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c434c9e0b41..6ad96d54567 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-20  Juanma Barranquero  <lekktu@gmail.com>
+
+        * makefile.w32-in (bootstrap-clean-CMD, bootstrap-clean-SH):
+        Don't copy ldefs-boot.el over loaddefs.el.
+        (bootstrap-clean): Remove loaddefs.el and don't depend on it.
+        (loaddefs.el-SH, loaddefs.el-CMD): Don't add autoloads and defvars
+        to loaddefs.el; they are not needed now.  Add coding cookie.
+
 2008-06-20  Miles Bader  <miles@gnu.org>
 
         * face-remap.el (face-remap-add-relative, face-remap-set-base):
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index 7a774fead9c..08385bef5bd 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -129,37 +129,26 @@ $(lisp)/loaddefs.el:
 loaddefs.el-SH:
         echo ";;; loaddefs.el --- automatically extracted autoloads" > $@
         echo ";;" >> $@; echo ";;; Code:" >> $@
-        echo "(autoload 'define-minor-mode \"easy-mmode\")" >>$@
-        echo "(autoload 'define-ccl-program \"ccl\")" >>$@
-        echo "(autoload 'regexp-opt \"regexp-opt\")" >>$@
-        echo "(autoload 'string-to-list \"mule-util\")" >>$@
-        echo "(autoload 'define-derived-mode \"derived\")" >>$@
-        echo "(autoload 'encoded-kbd-mode \"encoded-kb\")" >>$@
-        echo "(defvar cvs-global-menu nil)" >>$@
         echo "" >> $@
-        echo ";;; Local Variables:" >> $@
-        echo ";;; version-control: never" >> $@
-        echo ";;; no-byte-compile: t" >> $@
-        echo ";;; no-update-autoloads: t" >> $@
-        echo ";;; End:" >> $@
+        echo ";; Local Variables:" >> $@
+        echo ";; version-control: never" >> $@
+        echo ";; no-byte-compile: t" >> $@
+        echo ";; no-update-autoloads: t" >> $@
+        echo ";; coding: utf-8" >> $@
+        echo ";; End:" >> $@
         echo ";;; loaddefs.el ends here" >> $@
 
 loaddefs.el-CMD:
         echo ;;; loaddefs.el --- automatically extracted autoloads> $@
+        echo ;;>> $@
         echo ;;; Code:>> $@
-        echo (autoload 'define-minor-mode "easy-mmode")>> $@
-        echo (autoload 'define-ccl-program "ccl")>> $@
-        echo (autoload 'regexp-opt "regexp-opt")>> $@
-        echo (autoload 'string-to-list "mule-util")>> $@
-        echo (autoload 'define-derived-mode "derived")>> $@
-        echo (autoload 'encoded-kbd-mode "encoded-kb")>> $@
-        echo (defvar cvs-global-menu nil)>> $@
         echo.>> $@
-        echo ;;; Local Variables:>> $@
-        echo ;;; version-control: never>> $@
-        echo ;;; no-byte-compile: t>> $@
-        echo ;;; no-update-autoloads: t>> $@
-        echo ;;; End:>> $@
+        echo ;; Local Variables:>> $@
+        echo ;; version-control: never>> $@
+        echo ;; no-byte-compile: t>> $@
+        echo ;; no-update-autoloads: t>> $@
+        echo ;; coding: utf-8>> $@
+        echo ;; End:>> $@
         echo ;;; loaddefs.el ends here>> $@
 
 # Use . instead of $(lisp) because $(lisp) is an absolute file name,
@@ -384,22 +373,17 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
 # sources only.
 
 # Need separate version for sh and native cmd.exe
-# Note that bootstrap-clean-$(SHELLTYPE) copies ldefs-boot.el to loaddefs.el,
-# and thus the almost-empty loaddefs.el crafted by the $(lisp)/loaddefs.el
-# target can NOT be built _after_ bootstrap-clean-$(SHELLTYPE) does its
-# thing, or else an empty loaddefs.el will overwrite the full one.
-bootstrap-clean: $(lisp)/loaddefs.el
+bootstrap-clean:
+        - $(DEL) $(lisp)/loaddefs.el
         $(MAKE) $(MFLAGS) bootstrap-clean-$(SHELLTYPE)
 
 bootstrap-clean-CMD:
 #       if exist "$(EMACS)" $(MAKE) $(MFLAGS) autoloads
-        cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
         -for %%f in (. $(WINS)) do for %%g in (%%f\*.elc) do @$(DEL) %%g
 
 bootstrap-clean-SH:
 #       if test -f "$(EMACS)"; then $(MAKE) $(MFLAGS) autoloads; fi
 #       -rm -f $(lisp)/*.elc $(lisp)/*/*.elc
-        cp $(lisp)/ldefs-boot.el $(lisp)/loaddefs.el
         -for dir in . $(WINS); do rm -f $$dir/*.elc; done
 
 # Generate/update files for the bootstrap process.