Commit 42663650 authored by Eli Zaretskii's avatar Eli Zaretskii
Browse files

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.
parent e0c3eb89
2013-03-27 Eli Zaretskii <eliz@gnu.org> 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 * inc/ms-w32.h (sys_localtime) [_W64]: Provide a prototype, to
avoid MinGW64 compiler warnings in editfns.c. avoid MinGW64 compiler warnings in editfns.c.
......
...@@ -85,7 +85,7 @@ all: which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE) ...@@ -85,7 +85,7 @@ all: which-sh $(ALL) $(CLIENTRES) all-other-dirs-$(MAKETYPE)
all-other-dirs-$(MAKETYPE): maybe-bootstrap all-other-dirs-$(MAKETYPE): maybe-bootstrap
all-other-dirs-nmake: addsection all-other-dirs-nmake: $(BLD)/addsection.exe
cd ..\lib cd ..\lib
$(MAKE) $(MFLAGS) all $(MAKE) $(MFLAGS) all
cd ..\lib-src cd ..\lib-src
...@@ -98,7 +98,7 @@ all-other-dirs-nmake: addsection ...@@ -98,7 +98,7 @@ all-other-dirs-nmake: addsection
$(MAKE) $(MFLAGS) all $(MAKE) $(MFLAGS) all
cd ..\nt 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 all
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
...@@ -145,10 +145,10 @@ maybe-bootstrap-SH: doit ...@@ -145,10 +145,10 @@ maybe-bootstrap-SH: doit
# Bootstrap depends on cmdproxy because some Lisp functions # Bootstrap depends on cmdproxy because some Lisp functions
# loaded during bootstrap may need to run shell commands. # 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 $(MAKE) $(MFLAGS) $(XMFLAGS) all
bootstrap-nmake: addsection cmdproxy bootstrap-nmake: $(BLD)/addsection.exe $(BLD)/cmdproxy.exe
cd ..\lisp cd ..\lisp
$(MAKE) $(MFLAGS) bootstrap-clean $(MAKE) $(MFLAGS) bootstrap-clean
cd ..\src cd ..\src
...@@ -168,7 +168,7 @@ bootstrap-nmake: addsection cmdproxy ...@@ -168,7 +168,7 @@ bootstrap-nmake: addsection cmdproxy
$(MAKE) $(MFLAGS) DOC $(MAKE) $(MFLAGS) DOC
cd ..\nt 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 ../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
...@@ -249,7 +249,7 @@ install-other-dirs-gmake: all ...@@ -249,7 +249,7 @@ install-other-dirs-gmake: all
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
$(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim 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 - $(CP) $(BLD)/addpm.exe $(INSTALL_DIR)/bin
install-shortcuts: install-addpm install-shortcuts: install-addpm
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment