aboutsummaryrefslogtreecommitdiffstats
path: root/mps/code
diff options
context:
space:
mode:
authorRichard Kistruck2006-04-04 14:17:36 +0100
committerRichard Kistruck2006-04-04 14:17:36 +0100
commit75c828749cbd26057a4da970a63866ebf980be37 (patch)
treeab02bdde247253d533b2cea246149ac0d8908b60 /mps/code
parent7ddc4303edd95a447e81c006cf32da628515be46 (diff)
downloademacs-75c828749cbd26057a4da970a63866ebf980be37.tar.gz
emacs-75c828749cbd26057a4da970a63866ebf980be37.zip
Mps: fix windows build of text-executables needing formats, with new
make-variable FMTTEST, replacing DWTEST and HETEST, and fixing awlut.exe build. Copied from Perforce Change: 157962 ServerID: perforce.ravenbrook.com
Diffstat (limited to 'mps/code')
-rw-r--r--mps/code/commpost.nmk28
-rw-r--r--mps/code/w3almv.nmk45
-rw-r--r--mps/code/w3i3mv.nmk45
-rw-r--r--mps/code/w3ppmv.nmk45
4 files changed, 59 insertions, 104 deletions
diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index a205a1a618c..8383548b710 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -107,15 +107,15 @@ FORCE:
107$(PFM)\$(VARIETY)\version.obj: FORCE 107$(PFM)\$(VARIETY)\version.obj: FORCE
108 108
109$(PFM)\$(VARIETY)\finalcv.exe: $(PFM)\$(VARIETY)\finalcv.obj \ 109$(PFM)\$(VARIETY)\finalcv.exe: $(PFM)\$(VARIETY)\finalcv.obj \
110 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(DWOBJ) $(DWTESTOBJ) \ 110 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
111 $(MRGOBJ) $(TESTLIBOBJ) 111 $(MRGOBJ) $(TESTLIBOBJ)
112 112
113$(PFM)\$(VARIETY)\finaltest.exe: $(PFM)\$(VARIETY)\finaltest.obj \ 113$(PFM)\$(VARIETY)\finaltest.exe: $(PFM)\$(VARIETY)\finaltest.obj \
114 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(DWOBJ) $(DWTESTOBJ) \ 114 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
115 $(MRGOBJ) $(TESTLIBOBJ) 115 $(MRGOBJ) $(TESTLIBOBJ)
116 116
117$(PFM)\$(VARIETY)\expt825.exe: $(PFM)\$(VARIETY)\expt825.obj \ 117$(PFM)\$(VARIETY)\expt825.exe: $(PFM)\$(VARIETY)\expt825.obj \
118 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(DWOBJ) $(DWTESTOBJ) \ 118 $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
119 $(MRGOBJ) $(TESTLIBOBJ) 119 $(MRGOBJ) $(TESTLIBOBJ)
120 120
121$(PFM)\$(VARIETY)\locv.exe: $(PFM)\$(VARIETY)\locv.obj \ 121$(PFM)\$(VARIETY)\locv.exe: $(PFM)\$(VARIETY)\locv.obj \
@@ -144,27 +144,27 @@ $(PFM)\$(VARIETY)\protcv.exe: $(PFM)\$(VARIETY)\protcv.obj \
144 $(MPMOBJ) $(PLINTHOBJ) 144 $(MPMOBJ) $(PLINTHOBJ)
145 145
146$(PFM)\$(VARIETY)\mpsicv.exe: $(PFM)\$(VARIETY)\mpsicv.obj \ 146$(PFM)\$(VARIETY)\mpsicv.exe: $(PFM)\$(VARIETY)\mpsicv.obj \
147 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \ 147 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
148 $(TESTLIBOBJ) 148 $(TESTLIBOBJ)
149 149
150$(PFM)\$(VARIETY)\amcss.exe: $(PFM)\$(VARIETY)\amcss.obj \ 150$(PFM)\$(VARIETY)\amcss.exe: $(PFM)\$(VARIETY)\amcss.obj \
151 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \ 151 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
152 $(TESTLIBOBJ) 152 $(TESTLIBOBJ)
153 153
154$(PFM)\$(VARIETY)\amcsshe.exe: $(PFM)\$(VARIETY)\amcsshe.obj \ 154$(PFM)\$(VARIETY)\amcsshe.exe: $(PFM)\$(VARIETY)\amcsshe.obj \
155 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(HETESTOBJ) \ 155 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
156 $(TESTLIBOBJ) 156 $(TESTLIBOBJ)
157 157
158$(PFM)\$(VARIETY)\amsss.exe: $(PFM)\$(VARIETY)\amsss.obj \ 158$(PFM)\$(VARIETY)\amsss.exe: $(PFM)\$(VARIETY)\amsss.obj \
159 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \ 159 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
160 $(TESTLIBOBJ) 160 $(TESTLIBOBJ)
161 161
162$(PFM)\$(VARIETY)\amssshe.exe: $(PFM)\$(VARIETY)\amssshe.obj \ 162$(PFM)\$(VARIETY)\amssshe.exe: $(PFM)\$(VARIETY)\amssshe.obj \
163 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(HETESTOBJ) \ 163 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
164 $(TESTLIBOBJ) 164 $(TESTLIBOBJ)
165 165
166$(PFM)\$(VARIETY)\segsmss.exe: $(PFM)\$(VARIETY)\segsmss.obj \ 166$(PFM)\$(VARIETY)\segsmss.exe: $(PFM)\$(VARIETY)\segsmss.obj \
167 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \ 167 $(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
168 $(TESTLIBOBJ) 168 $(TESTLIBOBJ)
169 169
170$(PFM)\$(VARIETY)\locbwcss.exe: $(PFM)\$(VARIETY)\locbwcss.obj \ 170$(PFM)\$(VARIETY)\locbwcss.exe: $(PFM)\$(VARIETY)\locbwcss.obj \
@@ -175,11 +175,11 @@ $(PFM)\$(VARIETY)\dwstress.exe: $(PFM)\$(VARIETY)\dwstress.obj \
175 $(DWOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) 175 $(DWOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ)
176 176
177$(PFM)\$(VARIETY)\awlut.exe: $(PFM)\$(VARIETY)\awlut.obj \ 177$(PFM)\$(VARIETY)\awlut.exe: $(PFM)\$(VARIETY)\awlut.obj \
178 $(DWTESTOBJ) \ 178 $(FMTTESTOBJ) \
179 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ) 179 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ)
180 180
181$(PFM)\$(VARIETY)\awluthe.exe: $(PFM)\$(VARIETY)\awluthe.obj \ 181$(PFM)\$(VARIETY)\awluthe.exe: $(PFM)\$(VARIETY)\awluthe.obj \
182 $(HETESTOBJ) \ 182 $(FMTTESTOBJ) \
183 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ) 183 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ)
184 184
185$(PFM)\$(VARIETY)\poolncv.exe: $(PFM)\$(VARIETY)\poolncv.obj \ 185$(PFM)\$(VARIETY)\poolncv.exe: $(PFM)\$(VARIETY)\poolncv.obj \
@@ -228,15 +228,15 @@ $(PFM)\$(VARIETY)\messtest.exe: $(PFM)\$(VARIETY)\messtest.obj \
228 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) 228 $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
229 229
230$(PFM)\$(VARIETY)\steptest.exe: $(PFM)\$(VARIETY)\steptest.obj \ 230$(PFM)\$(VARIETY)\steptest.exe: $(PFM)\$(VARIETY)\steptest.obj \
231 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \ 231 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
232 $(TESTLIBOBJ) 232 $(TESTLIBOBJ)
233 233
234$(PFM)\$(VARIETY)\walkt0.exe: $(PFM)\$(VARIETY)\walkt0.obj \ 234$(PFM)\$(VARIETY)\walkt0.exe: $(PFM)\$(VARIETY)\walkt0.obj \
235 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \ 235 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
236 $(TESTLIBOBJ) 236 $(TESTLIBOBJ)
237 237
238$(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \ 238$(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \
239 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(DWOBJ) $(DWTESTOBJ) \ 239 $(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
240 $(TESTLIBOBJ) 240 $(TESTLIBOBJ)
241 241
242$(PFM)\$(VARIETY)\mmsw.lib: $(SWOBJ) 242$(PFM)\$(VARIETY)\mmsw.lib: $(SWOBJ)
diff --git a/mps/code/w3almv.nmk b/mps/code/w3almv.nmk
index d422a812d59..7c1c8e07b20 100644
--- a/mps/code/w3almv.nmk
+++ b/mps/code/w3almv.nmk
@@ -36,8 +36,7 @@ AMS = <poolams> <poolamsi>
36AWL = <poolawl> 36AWL = <poolawl>
37LO = <poollo> 37LO = <poollo>
38DW = <fmtdy> <fmtno> 38DW = <fmtdy> <fmtno>
39DWTEST = <fmtdytst> 39FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
40HETEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
41POOLN = <pooln> 40POOLN = <pooln>
42TESTLIB = <testlib> 41TESTLIB = <testlib>
43 42
@@ -77,10 +76,8 @@ SNCOBJ0 = $(SNC:<=w3almv\he\)
77SNCOBJ = $(SNCOBJ0:>=.obj) 76SNCOBJ = $(SNCOBJ0:>=.obj)
78DWOBJ0 = $(DW:<=w3almv\he\) 77DWOBJ0 = $(DW:<=w3almv\he\)
79DWOBJ = $(DWOBJ0:>=.obj) 78DWOBJ = $(DWOBJ0:>=.obj)
80DWTESTOBJ0 = $(DWTEST:<=w3almv\he\) 79FMTTESTOBJ0 = $(FMTTEST:<=w3almv\he\)
81DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 80FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
82HETESTOBJ0 = $(HETEST:<=w3almv\he\)
83HETESTOBJ = $(HETESTOBJ0:>=.obj)
84POOLNOBJ0 = $(POOLN:<=w3almv\he\) 81POOLNOBJ0 = $(POOLN:<=w3almv\he\)
85POOLNOBJ = $(POOLNOBJ0:>=.obj) 82POOLNOBJ = $(POOLNOBJ0:>=.obj)
86TESTLIBOBJ0 = $(TESTLIB:<=w3almv\he\) 83TESTLIBOBJ0 = $(TESTLIB:<=w3almv\he\)
@@ -108,10 +105,8 @@ SNCOBJ0 = $(SNC:<=w3almv\ce\)
108SNCOBJ = $(SNCOBJ0:>=.obj) 105SNCOBJ = $(SNCOBJ0:>=.obj)
109DWOBJ0 = $(DW:<=w3almv\ce\) 106DWOBJ0 = $(DW:<=w3almv\ce\)
110DWOBJ = $(DWOBJ0:>=.obj) 107DWOBJ = $(DWOBJ0:>=.obj)
111DWTESTOBJ0 = $(DWTEST:<=w3almv\ce\) 108FMTTESTOBJ0 = $(FMTTEST:<=w3almv\ce\)
112DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 109FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
113HETESTOBJ0 = $(HETEST:<=w3almv\ce\)
114HETESTOBJ = $(HETESTOBJ0:>=.obj)
115POOLNOBJ0 = $(POOLN:<=w3almv\ce\) 110POOLNOBJ0 = $(POOLN:<=w3almv\ce\)
116POOLNOBJ = $(POOLNOBJ0:>=.obj) 111POOLNOBJ = $(POOLNOBJ0:>=.obj)
117TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ce\) 112TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ce\)
@@ -139,10 +134,8 @@ SNCOBJ0 = $(SNC:<=w3almv\hi\)
139SNCOBJ = $(SNCOBJ0:>=.obj) 134SNCOBJ = $(SNCOBJ0:>=.obj)
140DWOBJ0 = $(DW:<=w3almv\hi\) 135DWOBJ0 = $(DW:<=w3almv\hi\)
141DWOBJ = $(DWOBJ0:>=.obj) 136DWOBJ = $(DWOBJ0:>=.obj)
142DWTESTOBJ0 = $(DWTEST:<=w3almv\hi\) 137FMTTESTOBJ0 = $(FMTTEST:<=w3almv\hi\)
143DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 138FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
144HETESTOBJ0 = $(HETEST:<=w3almv\hi\)
145HETESTOBJ = $(HETESTOBJ0:>=.obj)
146POOLNOBJ0 = $(POOLN:<=w3almv\hi\) 139POOLNOBJ0 = $(POOLN:<=w3almv\hi\)
147POOLNOBJ = $(POOLNOBJ0:>=.obj) 140POOLNOBJ = $(POOLNOBJ0:>=.obj)
148TESTLIBOBJ0 = $(TESTLIB:<=w3almv\hi\) 141TESTLIBOBJ0 = $(TESTLIB:<=w3almv\hi\)
@@ -170,10 +163,8 @@ SNCOBJ0 = $(SNC:<=w3almv\ci\)
170SNCOBJ = $(SNCOBJ0:>=.obj) 163SNCOBJ = $(SNCOBJ0:>=.obj)
171DWOBJ0 = $(DW:<=w3almv\ci\) 164DWOBJ0 = $(DW:<=w3almv\ci\)
172DWOBJ = $(DWOBJ0:>=.obj) 165DWOBJ = $(DWOBJ0:>=.obj)
173DWTESTOBJ0 = $(DWTEST:<=w3almv\ci\) 166FMTTESTOBJ0 = $(FMTTEST:<=w3almv\ci\)
174DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 167FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
175HETESTOBJ0 = $(HETEST:<=w3almv\ci\)
176HETESTOBJ = $(HETESTOBJ0:>=.obj)
177POOLNOBJ0 = $(POOLN:<=w3almv\ci\) 168POOLNOBJ0 = $(POOLN:<=w3almv\ci\)
178POOLNOBJ = $(POOLNOBJ0:>=.obj) 169POOLNOBJ = $(POOLNOBJ0:>=.obj)
179TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ci\) 170TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ci\)
@@ -201,10 +192,8 @@ SNCOBJ0 = $(SNC:<=w3almv\ti\)
201SNCOBJ = $(SNCOBJ0:>=.obj) 192SNCOBJ = $(SNCOBJ0:>=.obj)
202DWOBJ0 = $(DW:<=w3almv\ti\) 193DWOBJ0 = $(DW:<=w3almv\ti\)
203DWOBJ = $(DWOBJ0:>=.obj) 194DWOBJ = $(DWOBJ0:>=.obj)
204DWTESTOBJ0 = $(DWTEST:<=w3almv\ti\) 195FMTTESTOBJ0 = $(FMTTEST:<=w3almv\ti\)
205DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 196FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
206HETESTOBJ0 = $(HETEST:<=w3almv\ti\)
207HETESTOBJ = $(HETESTOBJ0:>=.obj)
208POOLNOBJ0 = $(POOLN:<=w3almv\ti\) 197POOLNOBJ0 = $(POOLN:<=w3almv\ti\)
209POOLNOBJ = $(POOLNOBJ0:>=.obj) 198POOLNOBJ = $(POOLNOBJ0:>=.obj)
210TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ti\) 199TESTLIBOBJ0 = $(TESTLIB:<=w3almv\ti\)
@@ -232,10 +221,8 @@ SNCOBJ0 = $(SNC:<=w3almv\wi\)
232SNCOBJ = $(SNCOBJ0:>=.obj) 221SNCOBJ = $(SNCOBJ0:>=.obj)
233DWOBJ0 = $(DW:<=w3almv\wi\) 222DWOBJ0 = $(DW:<=w3almv\wi\)
234DWOBJ = $(DWOBJ0:>=.obj) 223DWOBJ = $(DWOBJ0:>=.obj)
235DWTESTOBJ0 = $(DWTEST:<=w3almv\wi\) 224FMTTESTOBJ0 = $(FMTTEST:<=w3almv\wi\)
236DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 225FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
237HETESTOBJ0 = $(HETEST:<=w3almv\wi\)
238HETESTOBJ = $(HETESTOBJ0:>=.obj)
239POOLNOBJ0 = $(POOLN:<=w3almv\wi\) 226POOLNOBJ0 = $(POOLN:<=w3almv\wi\)
240POOLNOBJ = $(POOLNOBJ0:>=.obj) 227POOLNOBJ = $(POOLNOBJ0:>=.obj)
241TESTLIBOBJ0 = $(TESTLIB:<=w3almv\wi\) 228TESTLIBOBJ0 = $(TESTLIB:<=w3almv\wi\)
@@ -263,10 +250,8 @@ SNCOBJ0 = $(SNC:<=w3almv\we\)
263SNCOBJ = $(SNCOBJ0:>=.obj) 250SNCOBJ = $(SNCOBJ0:>=.obj)
264DWOBJ0 = $(DW:<=w3almv\we\) 251DWOBJ0 = $(DW:<=w3almv\we\)
265DWOBJ = $(DWOBJ0:>=.obj) 252DWOBJ = $(DWOBJ0:>=.obj)
266DWTESTOBJ0 = $(DWTEST:<=w3almv\we\) 253FMTTESTOBJ0 = $(FMTTEST:<=w3almv\we\)
267DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 254FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
268HETESTOBJ0 = $(HETEST:<=w3almv\we\)
269HETESTOBJ = $(HETESTOBJ0:>=.obj)
270POOLNOBJ0 = $(POOLN:<=w3almv\we\) 255POOLNOBJ0 = $(POOLN:<=w3almv\we\)
271POOLNOBJ = $(POOLNOBJ0:>=.obj) 256POOLNOBJ = $(POOLNOBJ0:>=.obj)
272TESTLIBOBJ0 = $(TESTLIB:<=w3almv\we\) 257TESTLIBOBJ0 = $(TESTLIB:<=w3almv\we\)
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 3f2c8cfce50..f738fa19735 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -37,8 +37,7 @@ AWL = <poolawl>
37LO = <poollo> 37LO = <poollo>
38SNC = <poolsnc> 38SNC = <poolsnc>
39DW = <fmtdy> <fmtno> 39DW = <fmtdy> <fmtno>
40DWTEST = <fmtdytst> 40FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
41HETEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
42POOLN = <pooln> 41POOLN = <pooln>
43TESTLIB = <testlib> 42TESTLIB = <testlib>
44 43
@@ -77,10 +76,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\he\)
77SNCOBJ = $(SNCOBJ0:>=.obj) 76SNCOBJ = $(SNCOBJ0:>=.obj)
78DWOBJ0 = $(DW:<=w3i3mv\he\) 77DWOBJ0 = $(DW:<=w3i3mv\he\)
79DWOBJ = $(DWOBJ0:>=.obj) 78DWOBJ = $(DWOBJ0:>=.obj)
80DWTESTOBJ0 = $(DWTEST:<=w3i3mv\he\) 79FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\he\)
81DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 80FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
82HETESTOBJ0 = $(HETEST:<=w3i3mv\he\)
83HETESTOBJ = $(HETESTOBJ0:>=.obj)
84POOLNOBJ0 = $(POOLN:<=w3i3mv\he\) 81POOLNOBJ0 = $(POOLN:<=w3i3mv\he\)
85POOLNOBJ = $(POOLNOBJ0:>=.obj) 82POOLNOBJ = $(POOLNOBJ0:>=.obj)
86TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\he\) 83TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\he\)
@@ -108,10 +105,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\ce\)
108SNCOBJ = $(SNCOBJ0:>=.obj) 105SNCOBJ = $(SNCOBJ0:>=.obj)
109DWOBJ0 = $(DW:<=w3i3mv\ce\) 106DWOBJ0 = $(DW:<=w3i3mv\ce\)
110DWOBJ = $(DWOBJ0:>=.obj) 107DWOBJ = $(DWOBJ0:>=.obj)
111DWTESTOBJ0 = $(DWTEST:<=w3i3mv\ce\) 108FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ce\)
112DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 109FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
113HETESTOBJ0 = $(HETEST:<=w3i3mv\ce\)
114HETESTOBJ = $(HETESTOBJ0:>=.obj)
115POOLNOBJ0 = $(POOLN:<=w3i3mv\ce\) 110POOLNOBJ0 = $(POOLN:<=w3i3mv\ce\)
116POOLNOBJ = $(POOLNOBJ0:>=.obj) 111POOLNOBJ = $(POOLNOBJ0:>=.obj)
117TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ce\) 112TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ce\)
@@ -139,10 +134,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\hi\)
139SNCOBJ = $(SNCOBJ0:>=.obj) 134SNCOBJ = $(SNCOBJ0:>=.obj)
140DWOBJ0 = $(DW:<=w3i3mv\hi\) 135DWOBJ0 = $(DW:<=w3i3mv\hi\)
141DWOBJ = $(DWOBJ0:>=.obj) 136DWOBJ = $(DWOBJ0:>=.obj)
142DWTESTOBJ0 = $(DWTEST:<=w3i3mv\hi\) 137FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hi\)
143DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 138FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
144HETESTOBJ0 = $(HETEST:<=w3i3mv\hi\)
145HETESTOBJ = $(HETESTOBJ0:>=.obj)
146POOLNOBJ0 = $(POOLN:<=w3i3mv\hi\) 139POOLNOBJ0 = $(POOLN:<=w3i3mv\hi\)
147POOLNOBJ = $(POOLNOBJ0:>=.obj) 140POOLNOBJ = $(POOLNOBJ0:>=.obj)
148TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\) 141TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hi\)
@@ -170,10 +163,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\ci\)
170SNCOBJ = $(SNCOBJ0:>=.obj) 163SNCOBJ = $(SNCOBJ0:>=.obj)
171DWOBJ0 = $(DW:<=w3i3mv\ci\) 164DWOBJ0 = $(DW:<=w3i3mv\ci\)
172DWOBJ = $(DWOBJ0:>=.obj) 165DWOBJ = $(DWOBJ0:>=.obj)
173DWTESTOBJ0 = $(DWTEST:<=w3i3mv\ci\) 166FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ci\)
174DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 167FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
175HETESTOBJ0 = $(HETEST:<=w3i3mv\ci\)
176HETESTOBJ = $(HETESTOBJ0:>=.obj)
177POOLNOBJ0 = $(POOLN:<=w3i3mv\ci\) 168POOLNOBJ0 = $(POOLN:<=w3i3mv\ci\)
178POOLNOBJ = $(POOLNOBJ0:>=.obj) 169POOLNOBJ = $(POOLNOBJ0:>=.obj)
179TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ci\) 170TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ci\)
@@ -201,10 +192,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\ti\)
201SNCOBJ = $(SNCOBJ0:>=.obj) 192SNCOBJ = $(SNCOBJ0:>=.obj)
202DWOBJ0 = $(DW:<=w3i3mv\ti\) 193DWOBJ0 = $(DW:<=w3i3mv\ti\)
203DWOBJ = $(DWOBJ0:>=.obj) 194DWOBJ = $(DWOBJ0:>=.obj)
204DWTESTOBJ0 = $(DWTEST:<=w3i3mv\ti\) 195FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\)
205DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 196FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
206HETESTOBJ0 = $(HETEST:<=w3i3mv\ti\)
207HETESTOBJ = $(HETESTOBJ0:>=.obj)
208POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\) 197POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\)
209POOLNOBJ = $(POOLNOBJ0:>=.obj) 198POOLNOBJ = $(POOLNOBJ0:>=.obj)
210TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\) 199TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
@@ -232,10 +221,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\wi\)
232SNCOBJ = $(SNCOBJ0:>=.obj) 221SNCOBJ = $(SNCOBJ0:>=.obj)
233DWOBJ0 = $(DW:<=w3i3mv\wi\) 222DWOBJ0 = $(DW:<=w3i3mv\wi\)
234DWOBJ = $(DWOBJ0:>=.obj) 223DWOBJ = $(DWOBJ0:>=.obj)
235DWTESTOBJ0 = $(DWTEST:<=w3i3mv\wi\) 224FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\wi\)
236DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 225FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
237HETESTOBJ0 = $(HETEST:<=w3i3mv\wi\)
238HETESTOBJ = $(HETESTOBJ0:>=.obj)
239POOLNOBJ0 = $(POOLN:<=w3i3mv\wi\) 226POOLNOBJ0 = $(POOLN:<=w3i3mv\wi\)
240POOLNOBJ = $(POOLNOBJ0:>=.obj) 227POOLNOBJ = $(POOLNOBJ0:>=.obj)
241TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\wi\) 228TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\wi\)
@@ -263,10 +250,8 @@ SNCOBJ0 = $(SNC:<=w3i3mv\we\)
263SNCOBJ = $(SNCOBJ0:>=.obj) 250SNCOBJ = $(SNCOBJ0:>=.obj)
264DWOBJ0 = $(DW:<=w3i3mv\we\) 251DWOBJ0 = $(DW:<=w3i3mv\we\)
265DWOBJ = $(DWOBJ0:>=.obj) 252DWOBJ = $(DWOBJ0:>=.obj)
266DWTESTOBJ0 = $(DWTEST:<=w3i3mv\we\) 253FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\)
267DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 254FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
268HETESTOBJ0 = $(HETEST:<=w3i3mv\we\)
269HETESTOBJ = $(HETESTOBJ0:>=.obj)
270POOLNOBJ0 = $(POOLN:<=w3i3mv\we\) 255POOLNOBJ0 = $(POOLN:<=w3i3mv\we\)
271POOLNOBJ = $(POOLNOBJ0:>=.obj) 256POOLNOBJ = $(POOLNOBJ0:>=.obj)
272TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\) 257TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\)
diff --git a/mps/code/w3ppmv.nmk b/mps/code/w3ppmv.nmk
index 9b95fd2c336..f75131a576e 100644
--- a/mps/code/w3ppmv.nmk
+++ b/mps/code/w3ppmv.nmk
@@ -33,8 +33,7 @@ AMS = <poolams> <poolamsi>
33AWL = <poolawl> 33AWL = <poolawl>
34LO = <poollo> 34LO = <poollo>
35DW = <fmtdy> <fmtno> 35DW = <fmtdy> <fmtno>
36DWTEST = <fmtdytst> 36FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
37HETEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
38POOLN = <pooln> 37POOLN = <pooln>
39TESTLIB = <testlib> 38TESTLIB = <testlib>
40 39
@@ -74,10 +73,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\he\)
74SNCOBJ = $(SNCOBJ0:>=.obj) 73SNCOBJ = $(SNCOBJ0:>=.obj)
75DWOBJ0 = $(DW:<=w3ppmv\he\) 74DWOBJ0 = $(DW:<=w3ppmv\he\)
76DWOBJ = $(DWOBJ0:>=.obj) 75DWOBJ = $(DWOBJ0:>=.obj)
77DWTESTOBJ0 = $(DWTEST:<=w3ppmv\he\) 76FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\he\)
78DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 77FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
79HETESTOBJ0 = $(HETEST:<=w3ppmv\he\)
80HETESTOBJ = $(HETESTOBJ0:>=.obj)
81POOLNOBJ0 = $(POOLN:<=w3ppmv\he\) 78POOLNOBJ0 = $(POOLN:<=w3ppmv\he\)
82POOLNOBJ = $(POOLNOBJ0:>=.obj) 79POOLNOBJ = $(POOLNOBJ0:>=.obj)
83TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\he\) 80TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\he\)
@@ -105,10 +102,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\ce\)
105SNCOBJ = $(SNCOBJ0:>=.obj) 102SNCOBJ = $(SNCOBJ0:>=.obj)
106DWOBJ0 = $(DW:<=w3ppmv\ce\) 103DWOBJ0 = $(DW:<=w3ppmv\ce\)
107DWOBJ = $(DWOBJ0:>=.obj) 104DWOBJ = $(DWOBJ0:>=.obj)
108DWTESTOBJ0 = $(DWTEST:<=w3ppmv\ce\) 105FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\ce\)
109DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 106FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
110HETESTOBJ0 = $(HETEST:<=w3ppmv\ce\)
111HETESTOBJ = $(HETESTOBJ0:>=.obj)
112POOLNOBJ0 = $(POOLN:<=w3ppmv\ce\) 107POOLNOBJ0 = $(POOLN:<=w3ppmv\ce\)
113POOLNOBJ = $(POOLNOBJ0:>=.obj) 108POOLNOBJ = $(POOLNOBJ0:>=.obj)
114TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ce\) 109TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ce\)
@@ -136,10 +131,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\hi\)
136SNCOBJ = $(SNCOBJ0:>=.obj) 131SNCOBJ = $(SNCOBJ0:>=.obj)
137DWOBJ0 = $(DW:<=w3ppmv\hi\) 132DWOBJ0 = $(DW:<=w3ppmv\hi\)
138DWOBJ = $(DWOBJ0:>=.obj) 133DWOBJ = $(DWOBJ0:>=.obj)
139DWTESTOBJ0 = $(DWTEST:<=w3ppmv\hi\) 134FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\hi\)
140DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 135FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
141HETESTOBJ0 = $(HETEST:<=w3ppmv\hi\)
142HETESTOBJ = $(HETESTOBJ0:>=.obj)
143POOLNOBJ0 = $(POOLN:<=w3ppmv\hi\) 136POOLNOBJ0 = $(POOLN:<=w3ppmv\hi\)
144POOLNOBJ = $(POOLNOBJ0:>=.obj) 137POOLNOBJ = $(POOLNOBJ0:>=.obj)
145TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\hi\) 138TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\hi\)
@@ -167,10 +160,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\ci\)
167SNCOBJ = $(SNCOBJ0:>=.obj) 160SNCOBJ = $(SNCOBJ0:>=.obj)
168DWOBJ0 = $(DW:<=w3ppmv\ci\) 161DWOBJ0 = $(DW:<=w3ppmv\ci\)
169DWOBJ = $(DWOBJ0:>=.obj) 162DWOBJ = $(DWOBJ0:>=.obj)
170DWTESTOBJ0 = $(DWTEST:<=w3ppmv\ci\) 163FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\ci\)
171DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 164FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
172HETESTOBJ0 = $(HETEST:<=w3ppmv\ci\)
173HETESTOBJ = $(HETESTOBJ0:>=.obj)
174POOLNOBJ0 = $(POOLN:<=w3ppmv\ci\) 165POOLNOBJ0 = $(POOLN:<=w3ppmv\ci\)
175POOLNOBJ = $(POOLNOBJ0:>=.obj) 166POOLNOBJ = $(POOLNOBJ0:>=.obj)
176TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ci\) 167TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ci\)
@@ -198,10 +189,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\ti\)
198SNCOBJ = $(SNCOBJ0:>=.obj) 189SNCOBJ = $(SNCOBJ0:>=.obj)
199DWOBJ0 = $(DW:<=w3ppmv\ti\) 190DWOBJ0 = $(DW:<=w3ppmv\ti\)
200DWOBJ = $(DWOBJ0:>=.obj) 191DWOBJ = $(DWOBJ0:>=.obj)
201DWTESTOBJ0 = $(DWTEST:<=w3ppmv\ti\) 192FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\ti\)
202DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 193FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
203HETESTOBJ0 = $(HETEST:<=w3ppmv\ti\)
204HETESTOBJ = $(HETESTOBJ0:>=.obj)
205POOLNOBJ0 = $(POOLN:<=w3ppmv\ti\) 194POOLNOBJ0 = $(POOLN:<=w3ppmv\ti\)
206POOLNOBJ = $(POOLNOBJ0:>=.obj) 195POOLNOBJ = $(POOLNOBJ0:>=.obj)
207TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ti\) 196TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\ti\)
@@ -229,10 +218,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\wi\)
229SNCOBJ = $(SNCOBJ0:>=.obj) 218SNCOBJ = $(SNCOBJ0:>=.obj)
230DWOBJ0 = $(DW:<=w3ppmv\wi\) 219DWOBJ0 = $(DW:<=w3ppmv\wi\)
231DWOBJ = $(DWOBJ0:>=.obj) 220DWOBJ = $(DWOBJ0:>=.obj)
232DWTESTOBJ0 = $(DWTEST:<=w3ppmv\wi\) 221FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\wi\)
233DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 222FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
234HETESTOBJ0 = $(HETEST:<=w3ppmv\wi\)
235HETESTOBJ = $(HETESTOBJ0:>=.obj)
236POOLNOBJ0 = $(POOLN:<=w3ppmv\wi\) 223POOLNOBJ0 = $(POOLN:<=w3ppmv\wi\)
237POOLNOBJ = $(POOLNOBJ0:>=.obj) 224POOLNOBJ = $(POOLNOBJ0:>=.obj)
238TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\wi\) 225TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\wi\)
@@ -260,10 +247,8 @@ SNCOBJ0 = $(SNC:<=w3ppmv\we\)
260SNCOBJ = $(SNCOBJ0:>=.obj) 247SNCOBJ = $(SNCOBJ0:>=.obj)
261DWOBJ0 = $(DW:<=w3ppmv\we\) 248DWOBJ0 = $(DW:<=w3ppmv\we\)
262DWOBJ = $(DWOBJ0:>=.obj) 249DWOBJ = $(DWOBJ0:>=.obj)
263DWTESTOBJ0 = $(DWTEST:<=w3ppmv\we\) 250FMTTESTOBJ0 = $(FMTTEST:<=w3ppmv\we\)
264DWTESTOBJ = $(DWTESTOBJ0:>=.obj) 251FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
265HETESTOBJ0 = $(HETEST:<=w3ppmv\we\)
266HETESTOBJ = $(HETESTOBJ0:>=.obj)
267POOLNOBJ0 = $(POOLN:<=w3ppmv\we\) 252POOLNOBJ0 = $(POOLN:<=w3ppmv\we\)
268POOLNOBJ = $(POOLNOBJ0:>=.obj) 253POOLNOBJ = $(POOLNOBJ0:>=.obj)
269TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\we\) 254TESTLIBOBJ0 = $(TESTLIB:<=w3ppmv\we\)