(TRES): New macro (copied from nt/makefile.w32-in).

($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 46293c7..7574de9 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-27  Juanma Barranquero  <lekktu@gmail.com>
+
+       * makefile.w32-in (TRES): New macro (copied from nt/makefile.w32-in).
+       ($(TRES)): New rule (copied from nt/makefile.w32-in).
+       ($(BLD)/emacsclientw.exe): Add dependency.
+
 2006-11-27  Eli Zaretskii  <eliz@gnu.org>
 
        * makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on

diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index 414842c..7f3fc12 100644 (file)
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -75,14 +75,18 @@ ECLIENTOBJS =       $(BLD)/emacsclient.$(O) \
                $(BLD)/getopt.$(O) \
                $(BLD)/getopt1.$(O) \
                $(BLD)/ntlib.$(O)
+TRES =         ../nt/$(BLD)/emacs.res
+
+$(TRES):       ../nt/emacs.rc
+               $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
 
 $(BLD)/emacsclient.exe:                $(ECLIENTOBJS)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
                $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
 
-$(BLD)/emacsclientw.exe:       $(ECLIENTOBJS)
+$(BLD)/emacsclientw.exe:       $(ECLIENTOBJS) $(TRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-               $(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
+               $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
 
 # emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in
 # can be edited to define VERSION string, which is part of ECLIENT_CFLAGS.