diff options
| author | Jason Rumney <jasonr@gnu.org> | 2008-04-10 09:48:22 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2008-04-10 09:48:22 +0000 |
| commit | 4429f88c1942b0fb05b83ace0df42e56481a66e5 (patch) | |
| tree | 480975f91828fd0abc0f70793b09fa4f00d04942 /lib-src | |
| parent | 99e0bf597ef0324db24ad1e4c2d28dbceab58b54 (diff) | |
| download | emacs-4429f88c1942b0fb05b83ace0df42e56481a66e5.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/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 11 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c27691a7597..2ed5830d550 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,9 @@ +2008-04-10 Jason Rumney <jasonr@gnu.org> + + * makefile.w32-in (CLIENTRES): New variable and target. + (TRES): Remove. + ($(BLD)/emacsclientw.exe): Use $(CLIENTRES) instead of $(TRES). + 2008-03-26 Chong Yidong <cyd@stupidchicken.com> * Version 22.2 released. 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. |