[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r112154: Fix last commit in nt/makefi
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r112154: Fix last commit in nt/makefile.w32-in, which broke bootstrap. |
Date: |
Wed, 27 Mar 2013 12:09:44 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 112154
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-03-27 12:09:44 +0200
message:
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.
modified:
nt/ChangeLog
nt/makefile.w32-in
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2013-03-27 08:40:24 +0000
+++ b/nt/ChangeLog 2013-03-27 10:09:44 +0000
@@ -1,5 +1,9 @@
2013-03-27 Eli Zaretskii <address@hidden>
+ * 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.
=== modified file 'nt/makefile.w32-in'
--- a/nt/makefile.w32-in 2013-03-27 08:31:16 +0000
+++ b/nt/makefile.w32-in 2013-03-27 10:09:44 +0000
@@ -85,7 +85,7 @@
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 @@
$(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 @@
# 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 @@
$(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 @@
$(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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r112154: Fix last commit in nt/makefile.w32-in, which broke bootstrap.,
Eli Zaretskii <=