[Emacs-diffs] Changes to emacs/lib-src/makefile.w32-in, v [EMACS_22_BASE]

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     Jason Rumney <jasonr>   08/04/10 09:48:08

Index: makefile.w32-in
===================================================================
RCS file: /sources/emacs/emacs/lib-src/makefile.w32-in,v
retrieving revision 2.64.2.13
retrieving revision 2.64.2.14
diff -u -b -r2.64.2.13 -r2.64.2.14
--- makefile.w32-in     26 Mar 2008 16:49:49 -0000      2.64.2.13
+++ makefile.w32-in     10 Apr 2008 09:48:08 -0000      2.64.2.14
@@ -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.