# HG changeset patch # User Juanma Barranquero # Date 1028101541 0 # Node ID 305617daabb46b975266853fdd9f83ab9762e9b2 # Parent ff5741579fc444518605362da2e8215066c0895d Revert some changes from 2002-07-23 because they don't work on MSVC/nmake builds. diff -r ff5741579fc4 -r 305617daabb4 lisp/makefile.w32-in --- a/lisp/makefile.w32-in Wed Jul 31 06:15:58 2002 +0000 +++ b/lisp/makefile.w32-in Wed Jul 31 07:45:41 2002 +0000 @@ -240,18 +240,14 @@ # load's in the files being compiled find the right files. # Need separate version for sh and native cmd.exe -compile: subdirs.el compile-$(SHELLTYPE) doit +compile-files: subdirs.el compile-files-$(SHELLTYPE) doit -compile-CMD: +compile-files-CMD: # -for %f in ($(lisp) $(WINS)) do for %g in (%f\*.elc) do @attrib -r %g - for %f in ($(COMPILE_FIRST)) do \ - if not exist %f \ - $(emacs) -f batch-byte-compile-if-not-done %f - for %f in (. $(WINS)) do for %g in (%f/*.el) do \ - if not exist %f/%g \ - $(emacs) -f batch-byte-compile-if-not-done %f/%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-SH: +compile-files-SH: # for elc in $(lisp)/*.elc $(lisp)/*/*.elc; do attrib -r $$elc; done for el in $(COMPILE_FIRST); do \ echo Compiling $$el; \ @@ -338,7 +334,7 @@ # Generate/update files for the bootstrap process. -bootstrap: update-subdirs autoloads compile finder-data custom-deps +bootstrap: autoloads compile-files finder-data custom-deps # # Assuming INSTALL_DIR is defined, copy the elisp files to it