mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-26 10:49:33 +00:00
Code Issues Releases Activity

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

Browse Source 
(cleanall): Don't delete *~.
This commit is contained in:
Eli Zaretskii 2007-07-20 19:32:26 +00:00
parent e4fe7e5e95
commit f37b8e41a1
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nt/ChangeLog
View File

@ -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> 2007-07-11 Jason Rumney <jasonr@gnu.org>
* gmake.defs (OLE32): New library to link. * gmake.defs (OLE32): New library to link.

14
nt/makefile.w32-in
View File

@ -138,10 +138,12 @@ maybe-bootstrap-SH: doit
exit -1; \ exit -1; \
fi 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 $(MAKE) $(MFLAGS) $(XMFLAGS) all
bootstrap-nmake: addsection bootstrap-nmake: addsection cmdproxy
cd ..\lisp cd ..\lisp
$(MAKE) $(MFLAGS) bootstrap-clean $(MAKE) $(MFLAGS) bootstrap-clean
cd ..\src cd ..\src
@ -151,18 +153,20 @@ bootstrap-nmake: addsection
cd ..\src cd ..\src
$(MAKE) $(MFLAGS) bootstrap $(MAKE) $(MFLAGS) bootstrap
$(MAKE) $(MFLAGS) bootstrap-clean $(MAKE) $(MFLAGS) bootstrap-clean
$(CP) $(BLD)/cmdproxy.exe ../bin
cd ..\lisp cd ..\lisp
$(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap $(MAKE) $(MFLAGS) SHELL=$(SHELLTYPE) bootstrap
cd ..\lib-src cd ..\lib-src
$(MAKE) $(MFLAGS) DOC $(MAKE) $(MFLAGS) DOC
cd ..\nt cd ..\nt
bootstrap-gmake: addsection bootstrap-gmake: addsection cmdproxy
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
$(CP) $(BLD)/cmdproxy.exe ../bin
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC
@ -248,7 +252,7 @@ info-gmake:
# Maintenance # Maintenance
# #
clean: clean-other-dirs-$(MAKETYPE) clean: clean-other-dirs-$(MAKETYPE)
- $(DEL) *~ $(COMPILER_TEMP_FILES) - $(DEL) $(COMPILER_TEMP_FILES)
- $(DEL_TREE) $(OBJDIR) - $(DEL_TREE) $(OBJDIR)
- $(DEL) stamp_BLD - $(DEL) stamp_BLD
- $(DEL) ../etc/DOC ../etc/DOC-X - $(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 ../lib-src cleanall
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../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) cleanall: clean cleanall-other-dirs-$(MAKETYPE)
- $(DEL_TREE) obj - $(DEL_TREE) obj
- $(DEL_TREE) obj-spd - $(DEL_TREE) obj-spd