diff options
| author | Miles Bader <miles@gnu.org> | 2008-04-23 05:55:42 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-04-23 05:55:42 +0000 |
| commit | a113b3ca322fd73d97d0d9d69c9f48dc13fb326a (patch) | |
| tree | 37b3ad22a198a83f68738ef86aec187bb6d926d9 /nt | |
| parent | e96a8d6dc0ffc35cf6c02924de2453c69fa8f6fe (diff) | |
| parent | 81fe843b5a3cc7708e0800aeb5bc0dbe448e800a (diff) | |
| download | emacs-a113b3ca322fd73d97d0d9d69c9f48dc13fb326a.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1121
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 12 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 15 |
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
|