diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2007-07-20 19:32:06 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2007-07-20 19:32:06 +0000 |
| commit | c68b22132707090a239afd9f08ce7df17f2a12be (patch) | |
| tree | 3d914dfdf08d82ffae74bfe180497ac1f5b59c51 | |
| parent | 0cdef944a2e03f0cbc9fce2532ef9b55e29cc406 (diff) | |
| download | emacs-c68b22132707090a239afd9f08ce7df17f2a12be.tar.gz | |
(bootstrap, bootstrap-nmake, bootstrap-gmake): Depend on cmdproxy.
(cleanall): Don't delete *~.
| -rw-r--r-- | nt/makefile.w32-in | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index f579855522e..69d53b357ae 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in @@ -138,10 +138,12 @@ maybe-bootstrap-SH: doit exit -1; \
fi
-bootstrap: addsection bootstrap-$(MAKETYPE)
+# Bootstrap depends on cmdproxy because some Lisp functions
+# loaded during bootstrap may need to run shell commands.
+bootstrap: addsection cmdproxy bootstrap-$(MAKETYPE)
$(MAKE) $(MFLAGS) $(XMFLAGS) all
-bootstrap-nmake: addsection
+bootstrap-nmake: addsection cmdproxy
cd ..\lisp
$(MAKE) $(MFLAGS) bootstrap-clean
cd ..\src
@@ -151,18 +153,20 @@ bootstrap-nmake: addsection cd ..\src
$(MAKE) $(MFLAGS) bootstrap
$(MAKE) $(MFLAGS) bootstrap-clean
+ $(CP) $(BLD)/cmdproxy.exe ../bin
cd ..\lisp
$(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap
cd ..\lib-src
$(MAKE) $(MFLAGS) DOC
cd ..\nt
-bootstrap-gmake: addsection
+bootstrap-gmake: addsection cmdproxy
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
+ $(CP) $(BLD)/cmdproxy.exe ../bin
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC
@@ -248,7 +252,7 @@ info-gmake: # Maintenance
#
clean: clean-other-dirs-$(MAKETYPE)
- - $(DEL) *~ $(COMPILER_TEMP_FILES)
+ - $(DEL) $(COMPILER_TEMP_FILES)
- $(DEL_TREE) $(OBJDIR)
- $(DEL) stamp_BLD
- $(DEL) ../etc/DOC ../etc/DOC-X
@@ -287,6 +291,8 @@ cleanall-other-dirs-gmake: $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall
+# We used to delete *~ here, but that might inadvertently remove
+# precious files if it happens to match their short 8+3 aliases.
cleanall: clean cleanall-other-dirs-$(MAKETYPE)
- $(DEL_TREE) obj
- $(DEL_TREE) obj-spd
|