From 0702b9956766a6afca23c300f6e228e3e4fb846e Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Wed, 31 Jul 2002 07:45:58 +0000 Subject: [PATCH] Revert some changes from 2002-07-23 because they don't work on MSVC/nmake builds. --- lisp/ChangeLog | 5 +++++ lisp/makefile.w32-in | 16 ++++++---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd8e2dfad30..a1138afc4a2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2002-07-31 Juanma Barranquero + + * makefile.w32-in: Revert some changes from 2002-07-23 because + they don't work on MSVC/nmake builds. + 2002-07-30 Kai Gro,b_(Bjohann * net/tramp.el: New version 2.0.5. diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in index 2f9a5e1ae0c..e3d42edc8fb 100644 --- a/lisp/makefile.w32-in +++ b/lisp/makefile.w32-in @@ -240,18 +240,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: 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 @@ bootstrap-clean-SH: # 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