# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1207820888 0
# Node ID 78d5ec9b30a5e0ad518656e1132b275c64085de2
# Parent  5e8c01d31b63a25598437baf77f0b50a0b09d2dc
(CLIENTRES): New variable and target.
(TRES): Remove.
($(BLD)/emacsclientw.exe): Use $(CLIENTRES) instead of $(TRES).

diff -r 5e8c01d31b63 -r 78d5ec9b30a5 lib-src/makefile.w32-in
--- a/lib-src/makefile.w32-in	Thu Apr 10 09:44:59 2008 +0000
+++ b/lib-src/makefile.w32-in	Thu Apr 10 09:48:08 2008 +0000
@@ -75,18 +75,19 @@
 		$(BLD)/getopt.$(O) \
 		$(BLD)/getopt1.$(O) \
 		$(BLD)/ntlib.$(O)
-TRES =		../nt/$(BLD)/emacs.res
+CLIENTRES =	../nt/$(BLD)/emacsclient.res
 
-$(TRES):	../nt/emacs.rc
-		$(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
+$(CLIENTRES):	../nt/emacsclient.rc
+	@echo Emacsclient resource file must be built from nt directory
+	@exit -1
 
 $(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) $(USER32) $(COMCTL32) $(LIBS)
 
-$(BLD)/emacsclientw.exe:	$(ECLIENTOBJS) $(TRES)
+$(BLD)/emacsclientw.exe:	$(ECLIENTOBJS) $(CLIENTRES)
 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
-		$(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS)
+		$(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(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.