(customize-changed-options): Doc addition. Load the

[gnu-emacs] / lisp / makefile.w32-in

diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index e3d42edc8fb29edbc3a9fd9b1c895161ae407ec9..31c39737c990d3bfa669b3120daf0a5563626c16 100644 (file)
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -2,17 +2,17 @@
 #  Copyright (c) 2000-2001 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
-#  
+#
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
 #  the Free Software Foundation; either version 2, or (at your option)
 #  any later version.
-#  
+#
 #  GNU Emacs is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-#  
+#
 #  You should have received a copy of the GNU General Public License
 #  along with GNU Emacs; see the file COPYING.  If not, write to the
 #  Free Software Foundation, Inc., 59 Temple Place - Suite 330,
@@ -141,6 +141,7 @@ setwins=subdirs=`find $$wd -type d -print`; \
 
 # Have to define the list of subdirs manually when not using sh.
 WINS=\
+       calc \
        calendar \
        emacs-lisp \
        emulation \
@@ -150,6 +151,7 @@ WINS=\
        language \
        mail \
        net \
+       obsolete \
        play \
        progmodes \
        term \
@@ -195,11 +197,12 @@ subdirs.el:
 update-subdirs: update-subdirs-$(SHELLTYPE)
 
 update-subdirs-CMD: doit
-       @set QWINS=
-       @for %d in ($(WINS)) do if not (%d)==(term) set QWINS=%QWINS% "%d"
-       echo ;; In load-path, after this directory should come> subdirs.el
+       echo ;; -*- no-byte-compile: t -*->subdirs.el
+       echo ;; In load-path, after this directory should come>> subdirs.el
        echo ;; certain of its subdirectories.  Here we specify them.>> subdirs.el
-       echo (normal-top-level-add-to-load-path $(SQUOTE)(%QWINS%))>> subdirs.el
+       echo (normal-top-level-add-to-load-path $(SQUOTE)(>> subdirs.el
+       @for %d in ($(WINS)) do if not (%d)==(term) echo "%d">> subdirs.el
+       echo ))>> subdirs.el
 
 update-subdirs-SH: doit
        wd=$(lisp); $(setwins); \
@@ -240,14 +243,14 @@ $(DONTCOMPILE:.el=.elc):
 # load's in the files being compiled find the right files.
 
 # Need separate version for sh and native cmd.exe
-compile-files: subdirs.el compile-files-$(SHELLTYPE) doit
+compile: subdirs.el compile-$(SHELLTYPE) doit
 
-compile-files-CMD:
+compile-CMD:
 #      -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @attrib -r %g
        for %f in ($(COMPILE_FIRST)) do $(emacs) -f batch-byte-compile %f
        for %f in (. $(WINS)) do for %g in (%f/*.el) do $(emacs) -f batch-byte-compile %f/%g
 
-compile-files-SH:
+compile-SH:
 #      for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done
        for el in $(COMPILE_FIRST); do \
          echo Compiling $$el; \
@@ -290,7 +293,7 @@ compile-calc: compile-calc-$(SHELLTYPE)
 compile-calc-CMD:
        for %f in ($(lisp)/calc/*.el) do $(emacs) -f batch-byte-compile %f
 
-compile-calc-SH: 
+compile-calc-SH:
        for el in $(lisp)/calc/*.el; do \
          echo Compiling $$el; \
          $(emacs) -f batch-byte-compile $$el || exit 1; \
@@ -305,7 +308,7 @@ backup-compiled-files:
 
 # Compile Lisp files, but save old compiled files first.
 
-compile: backup-compiled-files compile-files
+compile-after-backup: backup-compiled-files compile-always
 
 # Recompile all Lisp files which are newer than their .elc files.
 # Note that this doesn't create .elc files.  It only recompiles if an
@@ -334,7 +337,7 @@ bootstrap-clean-SH:
 
 # Generate/update files for the bootstrap process.
 
-bootstrap: autoloads compile-files finder-data custom-deps
+bootstrap: update-subdirs autoloads compile finder-data custom-deps
 
 #
 # Assuming INSTALL_DIR is defined, copy the elisp files to it
@@ -365,6 +368,6 @@ install:
 
 #
 # Maintenance
-# 
+#
 clean:
                - $(DEL) *~