diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-04-10 09:48:08 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-04-10 09:48:08 +0000 |
| commit | 7890b4dd1afae5a37524d2a25a9376baa3df3b6f (patch) | |
| tree | 45abb9236877aaaa52c37382c5a0f4e6084ff494 /lib-src | |
| parent | a45e1bdf2f54b7b6a166480bb3ff17e631ff1cbb (diff) | |
| download | emacs-7890b4dd1afae5a37524d2a25a9376baa3df3b6f.tar.gz | |
(CLIENTRES): New variable and target.
(TRES): Remove.
($(BLD)/emacsclientw.exe): Use $(CLIENTRES) instead of $(TRES).
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/makefile.w32-in | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 02f877581c8..e61bbca2a74 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -75,18 +75,19 @@ ECLIENTOBJS = $(BLD)/emacsclient.$(O) \ $(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. |