aboutsummaryrefslogtreecommitdiffstats
path: root/nt
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-27 12:09:44 +0200
committerEli Zaretskii2013-03-27 12:09:44 +0200
commit42663650badc9b0db28a63c0ef32f8d0aaae8d61 (patch)
treeb3d42d5c0b98c83a1ecc3ff91bba8587d631deb2 /nt
parente0c3eb8913d82ab60279acda8113bfe4ace483cb (diff)
downloademacs-42663650badc9b0db28a63c0ef32f8d0aaae8d61.tar.gz
emacs-42663650badc9b0db28a63c0ef32f8d0aaae8d61.zip
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.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/makefile.w32-in12
2 files changed, 10 insertions, 6 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 398d04e52a0..03bd86a3216 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,9 @@
12013-03-27 Eli Zaretskii <eliz@gnu.org> 12013-03-27 Eli Zaretskii <eliz@gnu.org>
2 2
3 * makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
4 (bootstrap, bootstrap-nmake, bootstrap-gmake, install-addpm):
5 Depend on .exe files.
6
3 * inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to 7 * inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to
4 avoid MinGW64 compiler warnings in editfns.c. 8 avoid MinGW64 compiler warnings in editfns.c.
5 9
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index 655d888c0d1..d3e1c8e2228 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -85,7 +85,7 @@ all: which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
85 85
86all-other-dirs-$(MAKETYPE): maybe-bootstrap 86all-other-dirs-$(MAKETYPE): maybe-bootstrap
87 87
88all-other-dirs-nmake: addsection 88all-other-dirs-nmake: $(BLD)/addsection.exe
89 cd ..\lib 89 cd ..\lib
90 $(MAKE) $(MFLAGS) all 90 $(MAKE) $(MFLAGS) all
91 cd ..\lib-src 91 cd ..\lib-src
@@ -98,7 +98,7 @@ all-other-dirs-nmake: addsection
98 $(MAKE) $(MFLAGS) all 98 $(MAKE) $(MFLAGS) all
99 cd ..\nt 99 cd ..\nt
100 100
101all-other-dirs-gmake: addsection 101all-other-dirs-gmake: $(BLD)/addsection.exe
102 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all 102 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib all
103 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all 103 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
104 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all 104 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
@@ -145,10 +145,10 @@ maybe-bootstrap-SH: doit
145 145
146# Bootstrap depends on cmdproxy because some Lisp functions 146# Bootstrap depends on cmdproxy because some Lisp functions
147# loaded during bootstrap may need to run shell commands. 147# loaded during bootstrap may need to run shell commands.
148bootstrap: addsection cmdproxy bootstrap-$(MAKETYPE) 148bootstrap: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe bootstrap-$(MAKETYPE)
149 $(MAKE) $(MFLAGS) $(XMFLAGS) all 149 $(MAKE) $(MFLAGS) $(XMFLAGS) all
150 150
151bootstrap-nmake: addsection cmdproxy 151bootstrap-nmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
152 cd ..\lisp 152 cd ..\lisp
153 $(MAKE) $(MFLAGS) bootstrap-clean 153 $(MAKE) $(MFLAGS) bootstrap-clean
154 cd ..\src 154 cd ..\src
@@ -168,7 +168,7 @@ bootstrap-nmake: addsection cmdproxy
168 $(MAKE) $(MFLAGS) DOC 168 $(MAKE) $(MFLAGS) DOC
169 cd ..\nt 169 cd ..\nt
170 170
171bootstrap-gmake: addsection cmdproxy 171bootstrap-gmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
172 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean 172 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
173 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean 173 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
174 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean 174 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
@@ -249,7 +249,7 @@ install-other-dirs-gmake: all
249 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install 249 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
250 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install 250 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
251 251
252install-addpm: $(INSTALL_DIR)/bin addpm 252install-addpm: $(INSTALL_DIR)/bin $(BLD)/addpm.exe
253 - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin 253 - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
254 254
255install-shortcuts: install-addpm 255install-shortcuts: install-addpm