aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2006-12-22 18:23:48 +0000
committerEli Zaretskii2006-12-22 18:23:48 +0000
commitb47342e3bf175c9d3e3f6c3f7549836a0a58eef9 (patch)
tree2f119ae136ebb52a810c4de3f5ff9438f7da94ef
parent596cbf7ea9e54e35efdea1c8a66fc006bc559f2d (diff)
downloademacs-b47342e3bf175c9d3e3f6c3f7549836a0a58eef9.tar.gz
emacs-b47342e3bf175c9d3e3f6c3f7549836a0a58eef9.zip
(addpm, ddeclient, cmdproxy, addsection)
(preprep, $(TRES), runemacs) ($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O)) ($(BLD)/cmdproxy.$(O), (BLD)/addsection.$(O), $(BLD)/preprep.$(O)): Depend on stamp_BLD instead of on $(BLD). (XMFLAGS): New macro. (all-other-dirs-nmake, all-other-dirs-gmake, recompile-nmake) (recompile-gmake, bootstrap-gmake, bootstrap-clean-gmake) (install-other-dirs-gmake, info-gmake, clean-other-dirs-gmake) (cleanall-other-dirs-gmake): Pass $(XMFLAGS) to sub-Make.
Diffstat
-rw-r--r--nt/ChangeLog28
-rw-r--r--nt/makefile.w32-in88
2 files changed, 69 insertions, 47 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index 60a49f7dab2..421742ce3af 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,13 +1,29 @@
12006-12-22 Eli Zaretskii <eliz@gnu.org>
2
3 * gmake.defs (stamp_BLD): Rename from $(BLD). Create a file
4 stamp_BLD after creating the $(BLD) directory.
5
6 * nmake.defs (stamp_BLD): Rename from $(BLD). Create a file
7 stamp_BLD after creating the $(BLD) directory.
8
9 * makefile.w32-in (addpm, ddeclient, cmdproxy, addsection)
10 (preprep, $(TRES), runemacs)
11 ($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O))
12 ($(BLD)/cmdproxy.$(O), (BLD)/addsection.$(O), $(BLD)/preprep.$(O)):
13 Depend on stamp_BLD instead of on $(BLD).
14 (XMFLAGS): New macro.
15 (all-other-dirs-nmake, all-other-dirs-gmake, recompile-nmake)
16 (recompile-gmake, bootstrap-gmake, bootstrap-clean-gmake)
17 (install-other-dirs-gmake, info-gmake, clean-other-dirs-gmake)
18 (cleanall-other-dirs-gmake): Pass $(XMFLAGS) to sub-Make.
19
12006-12-20 Eli Zaretskii <eliz@gnu.org> 202006-12-20 Eli Zaretskii <eliz@gnu.org>
2 21
3 * makefile.w32-in ($(TRES)): Depend on $(BLD). Use $< instead of 22 * makefile.w32-in ($(TRES)): Depend on $(BLD). Use $< instead of
4 $(ALL_DEPS). 23 $(ALL_DEPS).
5 ($(BLD)/addpm.$(O): 24 ($(BLD)/addpm.$(O), $(BLD)/ddeclient.$(O), $(BLD)/runemacs.$(O)
6 $(BLD)/ddeclient.$(O): 25 ($(BLD)/cmdproxy.$(O), $(BLD)/addsection.$(O), $(BLD)/preprep.$(O)):
7 $(BLD)/runemacs.$(O): 26 New dependency on $(BLD).
8 $(BLD)/cmdproxy.$(O):
9 $(BLD)/addsection.$(O):
10 $(BLD)/preprep.$(O)): New dependency on $(BLD).
11 (all-other-dirs-nmake, all-other-dirs-gmake, bootstrap-nmake) 27 (all-other-dirs-nmake, all-other-dirs-gmake, bootstrap-nmake)
12 (bootstrap-gmake): Depend on addsection. 28 (bootstrap-gmake): Depend on addsection.
13 29
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index f751bb7872f..3e997659fa4 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -27,27 +27,29 @@ ALL = addpm ddeclient runemacs cmdproxy addsection preprep
27 27
28TRES = $(BLD)/emacs.res 28TRES = $(BLD)/emacs.res
29 29
30addpm: $(BLD) $(BLD)/addpm.exe 30XMFLAGS =
31
32addpm: stamp_BLD $(BLD)/addpm.exe
31$(BLD)/addpm.exe: $(BLD)/addpm.$(O) 33$(BLD)/addpm.exe: $(BLD)/addpm.$(O)
32 $(LINK) $(LINK_OUT)$@ \ 34 $(LINK) $(LINK_OUT)$@ \
33 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) 35 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
34 36
35ddeclient: $(BLD) $(BLD)/ddeclient.exe 37ddeclient: stamp_BLD $(BLD)/ddeclient.exe
36$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O) 38$(BLD)/ddeclient.exe: $(BLD)/ddeclient.$(O)
37 $(LINK) $(LINK_OUT)$@ \ 39 $(LINK) $(LINK_OUT)$@ \
38 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) 40 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
39 41
40cmdproxy: $(BLD) $(BLD)/cmdproxy.exe 42cmdproxy: stamp_BLD $(BLD)/cmdproxy.exe
41$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O) 43$(BLD)/cmdproxy.exe: $(BLD)/cmdproxy.$(O)
42 $(LINK) $(LINK_OUT)$@ \ 44 $(LINK) $(LINK_OUT)$@ \
43 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) 45 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
44 46
45addsection: $(BLD) $(BLD)/addsection.exe 47addsection: stamp_BLD $(BLD)/addsection.exe
46$(BLD)/addsection.exe: $(BLD)/addsection.$(O) 48$(BLD)/addsection.exe: $(BLD)/addsection.$(O)
47 $(LINK) $(LINK_OUT)$@ \ 49 $(LINK) $(LINK_OUT)$@ \
48 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32) 50 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(USER32)
49 51
50preprep: $(BLD) $(BLD)/preprep.exe 52preprep: stamp_BLD $(BLD)/preprep.exe
51$(BLD)/preprep.exe: $(BLD)/preprep.$(O) 53$(BLD)/preprep.exe: $(BLD)/preprep.$(O)
52 $(LINK) $(LINK_OUT)$@ \ 54 $(LINK) $(LINK_OUT)$@ \
53 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) 55 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS)
@@ -56,10 +58,10 @@ $(BLD)/preprep.exe: $(BLD)/preprep.$(O)
56# The resource file. NT 3.10 requires the use of cvtres; even though 58# The resource file. NT 3.10 requires the use of cvtres; even though
57# it is not necessary on later versions, it is still ok to use it. 59# it is not necessary on later versions, it is still ok to use it.
58# 60#
59$(TRES): emacs.rc $(BLD) 61$(TRES): emacs.rc stamp_BLD
60 $(RC) $(RC_OUT)$(BLD)/emacs.res $< 62 $(RC) $(RC_OUT)$(BLD)/emacs.res $<
61 63
62runemacs: $(BLD) $(BLD)/runemacs.exe 64runemacs: stamp_BLD $(BLD)/runemacs.exe
63$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES) 65$(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
64 $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \ 66 $(LINK) $(LINK_OUT)$@ $(SUBSYSTEM_WINDOWS) \
65 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32) 67 $(LINK_FLAGS) $(ALL_DEPS) $(BASE_LIBS) $(ADVAPI32) $(USER32)
@@ -67,39 +69,43 @@ $(BLD)/runemacs.exe: $(BLD)/runemacs.$(O) $(TRES)
67which-sh: 69which-sh:
68 @echo Using $(THE_SHELL) as shell. 70 @echo Using $(THE_SHELL) as shell.
69 71
70$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): $(BLD) 72# These depend on stamp_BLD to make sure the $(BLD) directory is created
73# before the compilation begins, even if Make runs several commands
74# in parallel under "make -j".
75#
76$(BLD)/addpm.$(O) $(BLD)/ddeclient.$(O) $(BLD)/runemacs.$(O) $(BLD)/cmdproxy.$(O) $(BLD)/addsection.$(O) $(BLD)/preprep.$(O): stamp_BLD
71 77
72# 78#
73# Build emacs 79# Build emacs
74# 80#
75all: which-sh $(BLD) $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE) 81all: which-sh stamp_BLD $(ALL) maybe-bootstrap all-other-dirs-$(MAKETYPE)
76 82
77all-other-dirs-nmake: addsection 83all-other-dirs-nmake: addsection
78 cd ..\lib-src 84 cd ..\lib-src
79 $(MAKE) $(MFLAGS) all 85 $(MAKE) $(MFLAGS) $(XMFLAGS) all
80 cd ..\src 86 cd ..\src
81 $(MAKE) $(MFLAGS) all 87 $(MAKE) $(MFLAGS) $(XMFLAGS) all
82 cd ..\lisp 88 cd ..\lisp
83 $(MAKE) $(MFLAGS) all 89 $(MAKE) $(MFLAGS) $(XMFLAGS) all
84 cd ..\leim 90 cd ..\leim
85 $(MAKE) $(MFLAGS) all 91 $(MAKE) $(MFLAGS) $(XMFLAGS) all
86 cd ..\nt 92 cd ..\nt
87 93
88all-other-dirs-gmake: addsection 94all-other-dirs-gmake: addsection
89 $(MAKE) $(MFLAGS) -C ../lib-src all 95 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src all
90 $(MAKE) $(MFLAGS) -C ../src all 96 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src all
91 $(MAKE) $(MFLAGS) -C ../lisp all 97 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp all
92 $(MAKE) $(MFLAGS) -C ../leim all 98 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim all
93 99
94recompile: recompile-$(MAKETYPE) 100recompile: recompile-$(MAKETYPE)
95 101
96recompile-nmake: 102recompile-nmake:
97 cd ..\lisp 103 cd ..\lisp
98 $(MAKE) $(MFLAGS) recompile 104 $(MAKE) $(MFLAGS) $(XMFLAGS) recompile
99 cd ..\nt 105 cd ..\nt
100 106
101recompile-gmake: 107recompile-gmake:
102 $(MAKE) $(MFLAGS) -C ../lisp recompile 108 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp recompile
103 109
104#### Bootstrapping. 110#### Bootstrapping.
105 111
@@ -148,13 +154,13 @@ bootstrap-nmake: addsection
148 cd ..\nt 154 cd ..\nt
149 155
150bootstrap-gmake: addsection 156bootstrap-gmake: addsection
151 $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean 157 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
152 $(MAKE) $(MFLAGS) -C ../src clean 158 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
153 $(MAKE) $(MFLAGS) -C ../lib-src clean 159 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
154 $(MAKE) $(MFLAGS) -C ../src bootstrap 160 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap
155 $(MAKE) $(MFLAGS) -C ../src bootstrap-clean 161 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
156 $(MAKE) $(MFLAGS) -C ../lisp bootstrap 162 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap
157 $(MAKE) $(MFLAGS) -C ../lib-src DOC 163 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src DOC
158 164
159bootstrap-clean: bootstrap-clean-$(MAKETYPE) 165bootstrap-clean: bootstrap-clean-$(MAKETYPE)
160 166
@@ -165,8 +171,8 @@ bootstrap-clean-nmake:
165 $(MAKE) $(MFLAGS) bootstrap-clean 171 $(MAKE) $(MFLAGS) bootstrap-clean
166 172
167bootstrap-clean-gmake: 173bootstrap-clean-gmake:
168 $(MAKE) $(MFLAGS) -C ../src bootstrap-clean 174 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src bootstrap-clean
169 $(MAKE) $(MFLAGS) -C ../lisp bootstrap-clean 175 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp bootstrap-clean
170 176
171$(INSTALL_DIR): 177$(INSTALL_DIR):
172 - mkdir "$(INSTALL_DIR)" 178 - mkdir "$(INSTALL_DIR)"
@@ -211,10 +217,10 @@ install-other-dirs-nmake:
211 cd ..\nt 217 cd ..\nt
212 218
213install-other-dirs-gmake: 219install-other-dirs-gmake:
214 $(MAKE) $(MFLAGS) -C ../lib-src install 220 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src install
215 $(MAKE) $(MFLAGS) -C ../src install 221 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src install
216 $(MAKE) $(MFLAGS) -C ../lisp install 222 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp install
217 $(MAKE) $(MFLAGS) -C ../leim install 223 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim install
218 224
219force-info: 225force-info:
220# Note that man/makefile knows how to 226# Note that man/makefile knows how to
@@ -231,9 +237,9 @@ info-nmake:
231 $(MAKE) $(MFLAGS) info 237 $(MAKE) $(MFLAGS) info
232 238
233info-gmake: 239info-gmake:
234 $(MAKE) $(MFLAGS) -C ../man info 240 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../man info
235 $(MAKE) $(MFLAGS) -C ../lispref info 241 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispref info
236 $(MAKE) $(MFLAGS) -C ../lispintro info 242 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lispintro info
237# 243#
238# Maintenance 244# Maintenance
239# 245#
@@ -260,10 +266,10 @@ clean-other-dirs-nmake:
260 cd ..\nt 266 cd ..\nt
261 267
262clean-other-dirs-gmake: 268clean-other-dirs-gmake:
263 $(MAKE) $(MFLAGS) -C ../lib-src clean 269 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src clean
264 $(MAKE) $(MFLAGS) -C ../src clean 270 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src clean
265 $(MAKE) $(MFLAGS) -C ../lisp clean 271 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lisp clean
266 $(MAKE) $(MFLAGS) -C ../leim clean 272 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../leim clean
267 273
268cleanall-other-dirs-nmake: 274cleanall-other-dirs-nmake:
269 cd ..\lib-src 275 cd ..\lib-src
@@ -273,8 +279,8 @@ cleanall-other-dirs-nmake:
273 cd ..\nt 279 cd ..\nt
274 280
275cleanall-other-dirs-gmake: 281cleanall-other-dirs-gmake:
276 $(MAKE) $(MFLAGS) -C ../lib-src cleanall 282 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../lib-src cleanall
277 $(MAKE) $(MFLAGS) -C ../src cleanall 283 $(MAKE) $(MFLAGS) $(XMFLAGS) -C ../src cleanall
278 284
279cleanall: clean cleanall-other-dirs-$(MAKETYPE) 285cleanall: clean cleanall-other-dirs-$(MAKETYPE)
280 - $(DEL_TREE) obj 286 - $(DEL_TREE) obj
generated by cgit v1.2.1 (git 2.18.0) at 2026-02-17 09:07:28 +0000