Mercurial > emacs

comparison lib-src/makefile.w32-in @ 94293:ca9efc5939fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121
author Miles Bader <miles@gnu.org>
date Wed, 23 Apr 2008 05:55:42 +0000
parents 03d3c1202d61 78d5ec9b30a5
children 08caecebf31b
comparison
equal deleted inserted replaced
94292:f07af351ed0b 94293:ca9efc5939fc
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