diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2007-07-20 19:32:26 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2007-07-20 19:32:26 +0000 |
| commit | f37b8e41a1e0b9bbd5a8f553ec8b981a9bb2a48c (patch) | |
| tree | 9fe9eeb927b5870426e2e595f03a38a6c6d81d5f | |
| parent | e4fe7e5e9515ca3bf38acdbc86f4449a23535186 (diff) | |
| download | emacs-f37b8e41a1e0b9bbd5a8f553ec8b981a9bb2a48c.tar.gz | |
(bootstrap, bootstrap-nmake, bootstrap-gmake): Depend on cmdproxy.
(cleanall): Don't delete *~.
| -rw-r--r-- | nt/ChangeLog | 6 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 14 |
2 files changed, 16 insertions, 4 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 7f44ccbc008..56ca9da1bbe 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,9 @@ +2007-07-20 Eli Zaretskii <eliz@gnu.org> + + * makefile.w32-in (bootstrap, bootstrap-nmake, bootstrap-gmake): + Depend on cmdproxy. + (cleanall): Don't delete *~. + 2007-07-11 Jason Rumney <jasonr@gnu.org> * gmake.defs (OLE32): New library to link. 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
|