summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorJason Rumney <jasonr@gnu.org>2008-04-10 09:44:59 +0000
committerJason Rumney <jasonr@gnu.org>2008-04-10 09:44:59 +0000
commit99e0bf597ef0324db24ad1e4c2d28dbceab58b54 (patch)
tree53031d7a39ae099a68e7fce435724720314839c5 /nt
parent65af6499e937fc75c69e42b7af6a3722965a2210 (diff)
downloademacs-99e0bf597ef0324db24ad1e4c2d28dbceab58b54.tar.gz
(CLIENTRES): New variable and build target.
(all): Depend on it. ($(TRES)): Use $(TRES) in rule.
Diffstat (limited to 'nt')
-rw-r--r--nt/ChangeLog4
-rw-r--r--nt/makefile.w32-in15
2 files changed, 14 insertions, 5 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index ae0fe4dedef..6aea7bdc112 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -2,6 +2,10 @@
* emacsclient.rc: New file.
+ * makefile.w32-in (CLIENTRES): New variable and build target.
+ (all): Depend on it.
+ ($(TRES)): Use $(TRES) in rule.
+
2008-03-26 Chong Yidong <cyd@stupidchicken.com>
* Version 22.2 released.
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index e6567c048f3..aef71cfddd9 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -24,14 +24,16 @@
# FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out
# (and remove or replace this comment).
-ALL = addpm ddeclient runemacs cmdproxy addsection preprep
-
-.PHONY: $(ALL)
-
TRES = $(BLD)/emacs.res
+CLIENTRES = $(BLD)/emacsclient.res
XMFLAGS =
+ALL = addpm ddeclient runemacs cmdproxy addsection preprep $(CLIENTRES)
+
+.PHONY: $(ALL)
+
+
addpm: stamp_BLD $(BLD)/addpm.exe
$(BLD)/addpm.exe: $(BLD)/addpm.$(O)
$(LINK) $(LINK_OUT)$@ \
@@ -62,7 +64,10 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
# it is not necessary on later versions, it is still ok to use it.
#
$(TRES): emacs.rc stamp_BLD
- $(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc
+ $(RC) $(RC_OUT)$(TRES) emacs.rc
+
+$(CLIENTRES): emacsclient.rc stamp_BLD
+ $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc
runemacs: stamp_BLD $(BLD)/runemacs.exe
$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)