# HG changeset patch # User Eli Zaretskii # Date 1166658736 0 # Node ID 7ae36b2cbdc641dd5da17021dc6502cecdd94f91 # Parent 5ed505afa18e9f1fa0c7573984c673a9c67400c1 ($(TRES)): Depend on $(BLD). Use $< instead of $(ALL_DEPS). ($(BLD)/addpm.$(O): $(BLD)/ddeclient.$(O): $(BLD)/runemacs.$(O): $(BLD)/cmdproxy.$(O): $(BLD)/addsection.$(O): $(BLD)/preprep.$(O)): New dependency on $(BLD). (all-other-dirs-nmake, all-other-dirs-gmake, bootstrap-nmake) (bootstrap-gmake): Depend on addsection. diff -r 5ed505afa18e -r 7ae36b2cbdc6 nt/makefile.w32-in --- a/nt/makefile.w32-in Wed Dec 20 23:47:52 2006 +0000 +++ b/nt/makefile.w32-in Wed Dec 20 23:52:16 2006 +0000 @@ -56,8 +56,8 @@ # The resource file. NT 3.10 requires the use of cvtres; even though # it is not necessary on later versions, it is still ok to use it. # -$(TRES): emacs.rc - $(RC) $(RC_OUT)$(BLD)/emacs.res $(ALL_DEPS) +$(TRES): emacs.rc $(BLD) + $(RC) $(RC_OUT)$(BLD)/emacs.res $< runemacs: $(BLD) $(BLD)/runemacs.exe $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) @@ -67,12 +67,14 @@ which-sh: @echo Using $(THE_SHELL) as shell. +$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): $(BLD) + # # Build emacs # all: which-sh $(BLD) $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE) -all-other-dirs-nmake: +all-other-dirs-nmake: addsection cd ..\lib-src $(MAKE) $(MFLAGS) all cd ..\src @@ -83,7 +85,7 @@ $(MAKE) $(MFLAGS) all cd ..\nt -all-other-dirs-gmake: +all-other-dirs-gmake: addsection $(MAKE) $(MFLAGS) -C ../lib-src all $(MAKE) $(MFLAGS) -C ../src all $(MAKE) $(MFLAGS) -C ../lisp all @@ -129,7 +131,7 @@ bootstrap: addsection bootstrap-$(MAKETYPE) all -bootstrap-nmake: +bootstrap-nmake: addsection cd ..\lisp $(MAKE) $(MFLAGS) bootstrap-clean cd ..\src @@ -145,7 +147,7 @@ $(MAKE) $(MFLAGS) DOC cd ..\nt -bootstrap-gmake: +bootstrap-gmake: addsection $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean $(MAKE) $(MFLAGS) -C ../src clean $(MAKE) $(MFLAGS) -C ../lib-src clean