mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-19 18:13:55 +00:00
Code Issues Releases Activity

(TRES): New macro (copied from nt/makefile.w32-in).

Browse Source 
($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.
This commit is contained in:
Juanma Barranquero 2006-11-27 16:00:37 +00:00
parent 98198c4f7c
commit 4d91c8f904
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib-src/ChangeLog
View File

@ -1,3 +1,9 @@
2006-11-27 Juanma Barranquero <lekktu@gmail.com>
* makefile.w32-in (TRES): New macro (copied from nt/makefile.w32-in).
($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.
2006-11-27 Eli Zaretskii <eliz@gnu.org>
* makefile.w32-in ($(BLD)/emacsclient.$(O)): Depend on

8
lib-src/makefile.w32-in
View File

@ -75,14 +75,18 @@ ECLIENTOBJS = $(BLD)/emacsclient.$(O) \
$(BLD)/getopt.$(O) \
$(BLD)/getopt1.$(O) \
$(BLD)/ntlib.$(O)
TRES = ../nt/$(BLD)/emacs.res
$(TRES): ../nt/emacs.rc
$(RC) $(RC_OUT)../nt/$(BLD)/emacs.res $(ALL_DEPS)
$(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) $(LIBS)
$(BLD)/emacsclientw.exe: $(ECLIENTOBJS)
$(BLD)/emacsclientw.exe: $(ECLIENTOBJS) $(TRES)
# put wsock32.lib before $(LIBS) to ensure we don't link to ws2_32.lib
$(LINK) $(LINK_OUT)$@ -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(LIBS)
$(LINK) $(LINK_OUT)$@ $(TRES) -mwindows $(LINK_FLAGS) $(ECLIENTOBJS) $(WSOCK32) $(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.