Mercurial > emacs
comparison lib-src/makefile.w32-in @ 80482:78d5ec9b30a5
(CLIENTRES): New variable and target.
(TRES): Remove.
($(BLD)/emacsclientw.exe): Use $(CLIENTRES) instead of $(TRES).
author | Jason Rumney <jasonr@gnu.org> |
---|---|
date | Thu, 10 Apr 2008 09:48:08 +0000 |
parents | ae64208efa27 |
children | 3ef5ccb68dba ca9efc5939fc |
comparison
equal
deleted
inserted
replaced
80481:5e8c01d31b63 | 80482:78d5ec9b30a5 |
---|---|
73 ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\"" | 73 ECLIENT_CFLAGS = -DHAVE_GETCWD -DHAVE_STRERROR -DVERSION="\"$(VERSION)\"" |
74 ECLIENTOBJS = $(BLD)/emacsclient.$(O) \ | 74 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) |
78 TRES = ../nt/$(BLD)/emacs.res | 78 CLIENTRES = ../nt/$(BLD)/emacsclient.res |
79 | 79 |
80 $(TRES): ../nt/emacs.rc | 80 $(CLIENTRES): ../nt/emacsclient.rc |
81 $(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS) | 81 @echo Emacsclient resource file must be built from nt directory |
82 @exit -1 | |
82 | 83 |
83 $(BLD)/emacsclient.exe: $(ECLIENTOBJS) | 84 $(BLD)/emacsclient.exe: $(ECLIENTOBJS) |
84 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib | 85 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib |
85 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) | 86 $(LINK) $(LINK_OUT)$@ $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) |
86 | 87 |
87 $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES) | 88 $(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(CLIENTRES) |
88 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib | 89 # put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib |
89 $(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) | 90 $(LINK) $(LINK_OUT)$@ $(CLIENTRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(USER32) $(COMCTL32) $(LIBS) |
90 | 91 |
91 # emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in | 92 # emacsclient.$(O) depends on makefile.w32-in because makefile.w32-in |
92 # can be edited to define VERSION string, which is part of ECLIENT_CFLAGS. | 93 # can be edited to define VERSION string, which is part of ECLIENT_CFLAGS. |
93 $(BLD)/emacsclient.$(O): emacsclient.c makefile.w32-in | 94 $(BLD)/emacsclient.$(O): emacsclient.c makefile.w32-in |
94 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c | 95 $(CC) $(CFLAGS) $(ECLIENT_CFLAGS) $(CC_OUT)$@ emacsclient.c |