diff options
| author | Jason Rumney | 2008-04-10 09:44:59 +0000 |
|---|---|---|
| committer | Jason Rumney | 2008-04-10 09:44:59 +0000 |
| commit | 99e0bf597ef0324db24ad1e4c2d28dbceab58b54 (patch) | |
| tree | 53031d7a39ae099a68e7fce435724720314839c5 | |
| parent | 65af6499e937fc75c69e42b7af6a3722965a2210 (diff) | |
| download | emacs-99e0bf597ef0324db24ad1e4c2d28dbceab58b54.tar.gz emacs-99e0bf597ef0324db24ad1e4c2d28dbceab58b54.zip | |
(CLIENTRES): New variable and build target.
(all): Depend on it.
($(TRES)): Use $(TRES) in rule.
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/makefile.w32-in | 15 |
2 files changed, 14 insertions, 5 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index ae0fe4dedef..6aea7bdc112 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog | |||
| @@ -2,6 +2,10 @@ | |||
| 2 | 2 | ||
| 3 | * emacsclient.rc: New file. | 3 | * emacsclient.rc: New file. |
| 4 | 4 | ||
| 5 | * makefile.w32-in (CLIENTRES): New variable and build target. | ||
| 6 | (all): Depend on it. | ||
| 7 | ($(TRES)): Use $(TRES) in rule. | ||
| 8 | |||
| 5 | 2008-03-26 Chong Yidong <cyd@stupidchicken.com> | 9 | 2008-03-26 Chong Yidong <cyd@stupidchicken.com> |
| 6 | 10 | ||
| 7 | * Version 22.2 released. | 11 | * Version 22.2 released. |
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in index e6567c048f3..aef71cfddd9 100644 --- a/nt/makefile.w32-in +++ b/nt/makefile.w32-in | |||
| @@ -24,14 +24,16 @@ | |||
| 24 | # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out | 24 | # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out |
| 25 | # (and remove or replace this comment). | 25 | # (and remove or replace this comment). |
| 26 | 26 | ||
| 27 | ALL = addpm ddeclient runemacs cmdproxy addsection preprep | ||
| 28 | |||
| 29 | .PHONY: $(ALL) | ||
| 30 | |||
| 31 | TRES = $(BLD)/emacs.res | 27 | TRES = $(BLD)/emacs.res |
| 28 | CLIENTRES = $(BLD)/emacsclient.res | ||
| 32 | 29 | ||
| 33 | XMFLAGS = | 30 | XMFLAGS = |
| 34 | 31 | ||
| 32 | ALL = addpm ddeclient runemacs cmdproxy addsection preprep $(CLIENTRES) | ||
| 33 | |||
| 34 | .PHONY: $(ALL) | ||
| 35 | |||
| 36 | |||
| 35 | addpm: stamp_BLD $(BLD)/addpm.exe | 37 | addpm: stamp_BLD $(BLD)/addpm.exe |
| 36 | $(BLD)/addpm.exe: $(BLD)/addpm.$(O) | 38 | $(BLD)/addpm.exe: $(BLD)/addpm.$(O) |
| 37 | $(LINK) $(LINK_OUT)$@ \ | 39 | $(LINK) $(LINK_OUT)$@ \ |
| @@ -62,7 +64,10 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O) | |||
| 62 | # it is not necessary on later versions, it is still ok to use it. | 64 | # it is not necessary on later versions, it is still ok to use it. |
| 63 | # | 65 | # |
| 64 | $(TRES): emacs.rc stamp_BLD | 66 | $(TRES): emacs.rc stamp_BLD |
| 65 | $(RC) $(RC_OUT)$(BLD)/emacs.res emacs.rc | 67 | $(RC) $(RC_OUT)$(TRES) emacs.rc |
| 68 | |||
| 69 | $(CLIENTRES): emacsclient.rc stamp_BLD | ||
| 70 | $(RC) $(RC_OUT)$(CLIENTRES) emacsclient.rc | ||
| 66 | 71 | ||
| 67 | runemacs: stamp_BLD $(BLD)/runemacs.exe | 72 | runemacs: stamp_BLD $(BLD)/runemacs.exe |
| 68 | $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) | 73 | $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) |