Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121

2 files changed, 22 insertions, 5 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 4adb653464a..075814f120e 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,15 @@
+2008-04-23  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (ALL): Move $(CLIENTRES) from here...
+        (all): ...to here.  $(ALL) is a prerequisite of .PHONY, so having
+        a real file there is not a good idea.
+
+2008-04-23  Jason Rumney  <jasonr@gnu.org>
+
+        * makefile.w32-in (CLIENTRES): New variable and build target.
+        (all): Depend on it.
+        ($(TRES)): Use $(TRES) in rule.
+
 2008-04-21  Jason Rumney  <jasonr@gnu.org>
 
         * configure.bat (success): Print "make" rather than "gmake", as that
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index ddf279cbdf7..053961a0c58 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -24,13 +24,15 @@
 # FIXME: This file uses DOS EOLs.  Convert to Unix after 22.1 is out

 #        (and remove or replace this comment).

 

+TRES            = $(BLD)/emacs.res

+CLIENTRES       = $(BLD)/emacsclient.res

+

+XMFLAGS         =

+

 ALL             = addpm ddeclient runemacs cmdproxy addsection preprep

 

 .PHONY: $(ALL)

 

-TRES            = $(BLD)/emacs.res

-

-XMFLAGS         =

 

 addpm:            stamp_BLD $(BLD)/addpm.exe

 $(BLD)/addpm.exe: $(BLD)/addpm.$(O)

@@ -62,7 +64,10 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
 # it is not necessary on later versions, it is still ok to use it.

 #

 $(TRES):        emacs.rc icons/emacs.ico emacs.manifest stamp_BLD

-                $(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc

+                $(RC) $(RC_OUT)$(TRES) emacs.rc

+

+$(CLIENTRES):   emacsclient.rc stamp_BLD

+                $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc

 

 runemacs:         stamp_BLD $(BLD)/runemacs.exe

 $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)

@@ -81,7 +86,7 @@ $(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O
 #

 # Build emacs

 #

-all:    which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)

+all:    which-sh stamp_BLD $(ALL) $(CLIENTRES) maybe-bootstrap all-other-dirs-$(MAKETYPE)

 

 all-other-dirs-nmake: addsection

         cd ..\lib-src