diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2006-11-27 16:00:37 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2006-11-27 16:00:37 +0000 |
| commit | 4d91c8f904a56fc39e5a66c01112062823908e2d (patch) | |
| tree | 3de3c5cd63b849530772b3918233a89503d8d58c /lib-src | |
| parent | 98198c4f7c1900614b449eb848b22a2865fc6be7 (diff) | |
| download | emacs-4d91c8f904a56fc39e5a66c01112062823908e2d.tar.gz | |
(TRES): New macro (copied from nt/makefile.w32-in).
($(TRES)): New rule (copied from nt/makefile.w32-in).
($(BLD)/emacsclientw.exe): Add dependency.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 6 | ||||
| -rw-r--r-- | lib-src/makefile.w32-in | 8 |
2 files changed, 12 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 46293c728f9..7574de96799 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -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 diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in index 414842c1a12..7f3fc12ac1e 100644 --- a/lib-src/makefile.w32-in +++ b/lib-src/makefile.w32-in @@ -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. |