[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/nt/makefile.w32-in,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/nt/makefile.w32-in,v |
Date: |
Wed, 23 Apr 2008 05:55:48 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/04/23 05:55:42
Index: nt/makefile.w32-in
===================================================================
RCS file: /cvsroot/emacs/emacs/nt/makefile.w32-in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -b -r1.50 -r1.51
--- nt/makefile.w32-in 9 Apr 2008 16:31:56 -0000 1.50
+++ nt/makefile.w32-in 23 Apr 2008 05:55:41 -0000 1.51
@@ -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 @@
# 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 @@
#
# 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