Fix last commit in nt/makefile.w32-in, which broke bootstrap.

 nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
 (bootstrap, bootstrap-nmake, bootstrap-gmake, install-addpm):
 Depend on .exe files.

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 398d04e52a0e25f4bf25176c857d17c1c2702e7d..03bd86a3216769d39eaf88a9a5e4582c9137c9a7 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,9 @@
 2013-03-27  Eli Zaretskii  <eliz@gnu.org>
 
+       * makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
+       (bootstrap, bootstrap-nmake, bootstrap-gmake, install-addpm):
+       Depend on .exe files.
+
        * inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to
        avoid MinGW64 compiler warnings in editfns.c.
 

diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 655d888c0d1ae6d200db51d8b35cf832fc81ccdf..d3e1c8e2228e871715a1f4132133644047e2a054 100644 (file)
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -85,7 +85,7 @@ all:  which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
 
 all-other-dirs-$(MAKETYPE): maybe-bootstrap
 
-all-other-dirs-nmake: addsection
+all-other-dirs-nmake: $(BLD)/addsection.exe
        cd ..\lib
        $(MAKE) $(MFLAGS) all
        cd ..\lib-src
@@ -98,7 +98,7 @@ all-other-dirs-nmake: addsection
        $(MAKE) $(MFLAGS) all
        cd ..\nt
 
-all-other-dirs-gmake: addsection
+all-other-dirs-gmake: $(BLD)/addsection.exe
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
@@ -145,10 +145,10 @@ maybe-bootstrap-SH: doit
 
 # Bootstrap depends on cmdproxy because some Lisp functions
 # loaded during bootstrap may need to run shell commands.
-bootstrap:     addsection cmdproxy bootstrap-$(MAKETYPE)
+bootstrap:     $(BLD)/addsection.exe $(BLD)/cmdproxy.exe bootstrap-$(MAKETYPE)
        $(MAKE) $(MFLAGS) $(XMFLAGS) all
 
-bootstrap-nmake: addsection cmdproxy
+bootstrap-nmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
        cd ..\lisp
        $(MAKE) $(MFLAGS) bootstrap-clean
        cd ..\src
@@ -168,7 +168,7 @@ bootstrap-nmake: addsection cmdproxy
        $(MAKE) $(MFLAGS) DOC
        cd ..\nt
 
-bootstrap-gmake: addsection cmdproxy
+bootstrap-gmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
@@ -249,7 +249,7 @@ install-other-dirs-gmake: all
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
        $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
 
-install-addpm: $(INSTALL_DIR)/bin addpm
+install-addpm: $(INSTALL_DIR)/bin $(BLD)/addpm.exe
        - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
 
 install-shortcuts: install-addpm