aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog6
-rw-r--r--lib-src/makefile.w32-in8
2 files changed, 12 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 46293c728f9..7574de96799 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
12006-11-27 Juanma Barranquero <lekktu@gmail.com>
2
3 * makefile.w32-in (TRES): New macro (copied from nt/makefile.w32-in).
4 ($(TRES)): New rule (copied from nt/makefile.w32-in).
5 ($(BLD)/emacsclientw.exe): Add dependency.
6
12006-11-27 Eli Zaretskii <eliz@gnu.org> 72006-11-27 Eli Zaretskii <eliz@gnu.org>
2 8
3 * makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on 9 * makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 414842c1a12..7f3fc12ac1e 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -75,14 +75,18 @@ ECLIENTOBJS = $(BLD)/emacsclient.$(O) \
75 $(BLD)/getopt.$(O) \ 75 $(BLD)/getopt.$(O) \
76 $(BLD)/getopt1.$(O) \ 76 $(BLD)/getopt1.$(O) \
77 $(BLD)/ntlib.$(O) 77 $(BLD)/ntlib.$(O)
78TRES = ../nt/$(BLD)/emacs.res
79
80$(TRES): ../nt/emacs.rc
81 $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
78 82
79$(BLD)/emacsclient.exe: $(ECLIENTOBJS) 83$(BLD)/emacsclient.exe: $(ECLIENTOBJS)
80# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 84# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
81 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS) 85 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
82 86
83$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) 87$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES)
84# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib 88# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
85 $(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS) 89 $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
86 90
87# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in 91# emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
88# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS. 92# can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.