(bootstrap, bootstrap-nmake, bootstrap-gmake): Depend on cmdproxy.

(cleanall): Don't delete *~.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 7d7225e400b6bf726d350e48a13d6580e600108e..82157be6adecca1e66c0ec15a205a48a42c26bf2 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
+2007-07-16  Eli Zaretskii  <eliz@gnu.org>
+
+       * makefile.w32-in (bootstrap, bootstrap-nmake, bootstrap-gmake):
+       Depend on cmdproxy.
+       (cleanall): Don't delete *~.
+
 2007-07-15  Jason Rumney  <jasonr@gnu.org>
 
        * inc/sys/socket.h (uint16_t): Define if C99 does not appear to

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index f579855522e198f408c2ddf3b67ddb9fbd87d88f..69d53b357ae41c515a688d1658075c515abf713c 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -138,10 +138,12 @@ maybe-bootstrap-SH: doit
          exit -1; \\r
        fi\r
 \r
-bootstrap:     addsection bootstrap-$(MAKETYPE)\r
+# Bootstrap depends on cmdproxy because some Lisp functions\r
+# loaded during bootstrap may need to run shell commands.\r
+bootstrap:     addsection cmdproxy bootstrap-$(MAKETYPE)\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) all\r
 \r
-bootstrap-nmake: addsection\r
+bootstrap-nmake: addsection cmdproxy\r
        cd ..\lisp\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
        cd ..\src\r
@@ -151,18 +153,20 @@ bootstrap-nmake: addsection
        cd ..\src\r
        $(MAKE) $(MFLAGS) bootstrap\r
        $(MAKE) $(MFLAGS) bootstrap-clean\r
+       $(CP) $(BLD)/cmdproxy.exe ../bin\r
        cd ..\lisp\r
        $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap\r
        cd ..\lib-src\r
        $(MAKE) $(MFLAGS) DOC\r
        cd ..\nt\r
 \r
-bootstrap-gmake: addsection\r
+bootstrap-gmake: addsection cmdproxy\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean\r
+       $(CP) $(BLD)/cmdproxy.exe ../bin\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC\r
 \r
@@ -248,7 +252,7 @@ info-gmake:
 # Maintenance\r
 #\r
 clean: clean-other-dirs-$(MAKETYPE)\r
-       - $(DEL) *~ $(COMPILER_TEMP_FILES)\r
+       - $(DEL) $(COMPILER_TEMP_FILES)\r
        - $(DEL_TREE) $(OBJDIR)\r
        - $(DEL) stamp_BLD\r
        - $(DEL) ../etc/DOC ../etc/DOC-X\r
@@ -287,6 +291,8 @@ cleanall-other-dirs-gmake:
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall\r
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall\r
 \r
+# We used to delete *~ here, but that might inadvertently remove\r
+# precious files if it happens to match their short 8+3 aliases.\r
 cleanall: clean cleanall-other-dirs-$(MAKETYPE)\r
         - $(DEL_TREE) obj\r
         - $(DEL_TREE) obj-spd\r