aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-04-11 18:59:13 +0000
committerEli Zaretskii2008-04-11 18:59:13 +0000
commit4cbb903fcb853c42b32a4101f03dc3c56077b35f (patch)
tree271064a05a9f58618ff2159280a802fbbe83cced
parent7f9020f1a2f1811e3dc4af358b90007979aa8fb8 (diff)
downloademacs-4cbb903fcb853c42b32a4101f03dc3c56077b35f.tar.gz
emacs-4cbb903fcb853c42b32a4101f03dc3c56077b35f.zip
(ALL): Move $(CLIENTRES) from here...
(all): ...to here. $(ALL) is a prerequisite of .PHONY, so having a real file there is not a good idea.
-rw-r--r--nt/ChangeLog6
-rw-r--r--nt/makefile.w32-in4
2 files changed, 8 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 6aea7bdc112..b2c31b303c1 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,9 @@
12008-04-11 Eli Zaretskii <eliz@gnu.org>
2
3 * makefile.w32-in (ALL): Move $(CLIENTRES) from here...
4 (all): ...to here. $(ALL) is a prerequisite of .PHONY, so having
5 a real file there is not a good idea.
6
12008-04-10 Jason Rumney <jasonr@gnu.org> 72008-04-10 Jason Rumney <jasonr@gnu.org>
2 8
3 * emacsclient.rc: New file. 9 * emacsclient.rc: New file.
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index aef71cfddd9..e9ffd8f5832 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -29,7 +29,7 @@ CLIENTRES = $(BLD)/emacsclient.res
29 29
30XMFLAGS = 30XMFLAGS =
31 31
32ALL = addpm ddeclient runemacs cmdproxy addsection preprep $(CLIENTRES) 32ALL = addpm ddeclient runemacs cmdproxy addsection preprep
33 33
34.PHONY: $(ALL) 34.PHONY: $(ALL)
35 35
@@ -86,7 +86,7 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
86# 86#
87# Build emacs 87# Build emacs
88# 88#
89all: which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE) 89all: which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)
90 90
91all-other-dirs-nmake: addsection 91all-other-dirs-nmake: addsection
92 cd ..\lib-src 92 cd ..\lib-src