From 894ce316996bce7d9abc29efb28890aa116d8909 Mon Sep 17 00:00:00 2001
From: Richard Brooksby
Date: Sun, 2 Sep 2012 12:27:20 +0100
Subject: Merging the plinth and default pools into the mps library, as on
 other platforms, and building the tests using the library rather than object
 files.

Copied from Perforce
 Change: 179172
 ServerID: perforce.ravenbrook.com

---
 mps/code/commpost.nmk | 124 +++++++++++++++++++-------------------------------
 mps/code/w3i3mv.nmk   |  88 ++++++++---------------------------
 mps/code/w3i6mv.nmk   |  88 ++++++++---------------------------
 3 files changed, 87 insertions(+), 213 deletions(-)

(limited to 'mps/code')

diff --git a/mps/code/commpost.nmk b/mps/code/commpost.nmk
index d150a37df10..05ed6a0ba84 100644
--- a/mps/code/commpost.nmk
+++ b/mps/code/commpost.nmk
@@ -20,7 +20,7 @@ all: mpmss.exe amcss.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awluthe.exe
      abqtest.exe cbstest.exe btcv.exe mv2test.exe messtest.exe steptest.exe \
      locbwcss.exe locusss.exe zcoll.exe zmess.exe \
      eventcnv.exe \
-     mps.lib mpsplan.lib
+     mps.lib
 
 
 # Convenience targets
@@ -37,7 +37,7 @@ mpmss.exe amcss.exe amcsshe.exe amsss.exe amssshe.exe segsmss.exe awlut.exe awlu
      walkt0.exe locbwcss.exe locusss.exe \
      exposet0.exe zcoll.exe zmess.exe \
      replay.exe replaysw.exe eventcnv.exe \
-     mps.lib mpsplan.lib mpsplcb.lib \
+     mps.lib mpsplcb.lib \
      mpsdy.dll:
 !IFDEF VARIETY
 	$(MAKE) /nologo /f $(PFM).nmk TARGET=$@ variety
@@ -91,115 +91,101 @@ mpsicv.cov:
 !IFDEF VARIETY
 
 $(PFM)\$(VARIETY)\finalcv.exe: $(PFM)\$(VARIETY)\finalcv.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
-	$(MRGOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\finaltest.exe: $(PFM)\$(VARIETY)\finaltest.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
-	$(MRGOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\expt825.exe: $(PFM)\$(VARIETY)\expt825.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
-	$(MRGOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\locv.exe:  $(PFM)\$(VARIETY)\locv.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\mpmss.exe: $(PFM)\$(VARIETY)\mpmss.obj \
-	$(PFM)\$(VARIETY)\poolmvff.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\apss.exe: $(PFM)\$(VARIETY)\apss.obj \
-	$(PFM)\$(VARIETY)\poolmvff.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\sacss.exe: $(PFM)\$(VARIETY)\sacss.obj \
-	$(PFM)\$(VARIETY)\poolmvff.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\bttest.exe: $(PFM)\$(VARIETY)\bttest.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\teletest.exe: $(PFM)\$(VARIETY)\teletest.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\lockcov.exe: $(PFM)\$(VARIETY)\lockcov.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\lockutw3.exe: $(PFM)\$(VARIETY)\lockutw3.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\mpsicv.exe: $(PFM)\$(VARIETY)\mpsicv.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amcss.exe: $(PFM)\$(VARIETY)\amcss.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amcsshe.exe: $(PFM)\$(VARIETY)\amcsshe.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amsss.exe: $(PFM)\$(VARIETY)\amsss.obj \
-	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\amssshe.exe: $(PFM)\$(VARIETY)\amssshe.obj \
-	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\segsmss.exe: $(PFM)\$(VARIETY)\segsmss.obj \
-	$(MPMOBJ) $(AMSOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\locbwcss.exe: $(PFM)\$(VARIETY)\locbwcss.obj \
-	$(PFM)\$(VARIETY)\poolmvff.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\locusss.exe: $(PFM)\$(VARIETY)\locusss.obj \
-	$(PFM)\$(VARIETY)\poolmvff.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
-$(PFM)\$(VARIETY)\dwstress.exe:  $(PFM)\$(VARIETY)\dwstress.obj \
-	$(DWOBJ) $(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ)
+$(PFM)\$(VARIETY)\dwstress.exe: $(PFM)\$(VARIETY)\dwstress.obj \
+	$(DWOBJ) $(PFM)\$(VARIETY)\mps.lib
 
-$(PFM)\$(VARIETY)\awlut.exe:  $(PFM)\$(VARIETY)\awlut.obj \
+$(PFM)\$(VARIETY)\awlut.exe: $(PFM)\$(VARIETY)\awlut.obj \
         $(FMTTESTOBJ) \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\awluthe.exe:  $(PFM)\$(VARIETY)\awluthe.obj \
 	$(FMTTESTOBJ) \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(LOOBJ) $(AWLOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\poolncv.exe:  $(PFM)\$(VARIETY)\poolncv.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ) $(POOLNOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\qs.exe: $(PFM)\$(VARIETY)\qs.obj \
-	$(AMCOBJ) $(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\arenacv.exe:  $(PFM)\$(VARIETY)\arenacv.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\abqtest.exe: $(PFM)\$(VARIETY)\abqtest.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\cbstest.exe: $(PFM)\$(VARIETY)\cbstest.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\btcv.exe: $(PFM)\$(VARIETY)\btcv.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\mv2test.exe: $(PFM)\$(VARIETY)\mv2test.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\zcoll.exe: $(PFM)\$(VARIETY)\zcoll.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
-	$(MRGOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) \
+	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\zmess.exe: $(PFM)\$(VARIETY)\zmess.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(AMCOBJ) $(FMTTESTOBJ) \
-	$(MRGOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) \
+	$(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\eventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \
 	$(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj
@@ -207,8 +193,7 @@ $(PFM)\$(VARIETY)\eventcnv.exe: $(PFM)\$(VARIETY)\eventcnv.obj \
 $(PFM)\$(VARIETY)\replay.exe: $(PFM)\$(VARIETY)\replay.obj \
   $(PFM)\$(VARIETY)\eventrep.obj \
   $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj \
-  $(MPMOBJ) $(AWLOBJ) $(AMSOBJ) $(POOLNOBJ) $(AMCOBJ) $(SNCOBJ) \
-  $(PFM)\$(VARIETY)\poolmvff.obj $(PFM)\$(VARIETY)\mpsliban.obj
+  $(PFM)\$(VARIETY)\mps.lib
 
 # Have to rename the object file, because the names must match, or
 # the template rule for .exe.obj won't be used.
@@ -216,29 +201,21 @@ $(PFM)\$(VARIETY)\replaysw.obj: $(PFM)\$(VARIETY)\replay.obj
 	$(ECHO) $@
 	copy $** $@ >nul:
 
-$(PFM)\$(VARIETY)\replaysw.exe: $(PFM)\$(VARIETY)\replaysw.obj \
-  $(PFM)\$(VARIETY)\eventrep.obj \
-  $(PFM)\$(VARIETY)\eventpro.obj $(PFM)\$(VARIETY)\table.obj \
-  $(PFM)\$(VARIETY)\fmtpstst.obj $(TESTLIBOBJ) \
-  $(PFM)\$(VARIETY)\mpsliban.obj $(SWOBJ)
-
 $(PFM)\$(VARIETY)\messtest.exe: $(PFM)\$(VARIETY)\messtest.obj \
-	$(MPMOBJ) $(PLINTHOBJ) $(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\steptest.exe: $(PFM)\$(VARIETY)\steptest.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)
 
 $(PFM)\$(VARIETY)\walkt0.exe: $(PFM)\$(VARIETY)\walkt0.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)	
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)	
 
 $(PFM)\$(VARIETY)\exposet0.exe: $(PFM)\$(VARIETY)\exposet0.obj \
-	$(MPMOBJ) $(AMCOBJ) $(PLINTHOBJ) $(FMTTESTOBJ) \
-	$(TESTLIBOBJ)	
+	$(PFM)\$(VARIETY)\mps.lib $(FMTTESTOBJ) $(TESTLIBOBJ)	
 
-$(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
-        $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ)
+$(PFM)\$(VARIETY)\mps.lib: \
+        $(MPMOBJ) $(AMCOBJ) $(AMSOBJ) $(AWLOBJ) $(LOOBJ) $(SNCOBJ) \
+        $(MVFFOBJ) $(PLINTHOBJ) $(POOLNOBJ)
 	$(ECHO) $@
 	cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c
 	$(LIBMAN) $(LIBFLAGS) /OUT:$@ $** $(PFM)\$(VARIETY)\version.o
@@ -248,20 +225,16 @@ $(PFM)\$(VARIETY)\mps.lib: $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
 # but this is not to be treated as an object on the linker line.  Sorry
 # about the repetition of the object list.
 $(PFM)\$(VARIETY)\mpsdy.dll: $(PFM)\$(VARIETY)\mpslibcb.obj \
-	$(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
+	$(MPMOBJ) $(LOOBJ) $(SNCOBJ) \
 	$(MVFFOBJ) $(AMSOBJ) $(AWLOBJ) w3gen.def \
 	mpslibcb.def
 	$(ECHO) $@
 	$(LINKER) $(LINKFLAGS) /def:w3gen.def \
 	  /def:mpslibcb.def /dll /OUT:$@ \
 	  $(PFM)\$(VARIETY)\mpslibcb.obj \
-	  $(MPMOBJ) $(AMCOBJ) $(LOOBJ) $(SNCOBJ) \
+	  $(MPMOBJ) $(LOOBJ) $(SNCOBJ) \
 	  $(MVFFOBJ) $(AMSOBJ) $(AWLOBJ)
 
-$(PFM)\$(VARIETY)\mpsplan.lib: $(PLINTHOBJ)
-	$(ECHO) $@
-	$(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
-
 $(PFM)\$(VARIETY)\mpsplcb.lib: $(PFM)\$(VARIETY)\mpslibcb.obj
 	$(ECHO) $@
 	$(LIBMAN) $(LIBFLAGS) /OUT:$@ $**
@@ -299,8 +272,7 @@ $(PFM)\$(VARIETY)\mpsplcb.lib: $(PFM)\$(VARIETY)\mpslibcb.obj
 
 {$(PFM)\$(VARIETY)}.obj{$(PFM)\$(VARIETY)}.exe:
 	$(ECHO) $@
-	cl /c $(CFLAGS) /Fd$(PFM)\$(VARIETY)\ /Fo$(PFM)\$(VARIETY)\version.o version.c
-	$(LINKER) $(LINKFLAGS) /PDB:$*.pdb /OUT:$@ $(**) $(PFM)\$(VARIETY)\version.o
+	$(LINKER) $(LINKFLAGS) /PDB:$*.pdb /OUT:$@ $(**)
 
 
 # C. COPYRIGHT AND LICENSE
diff --git a/mps/code/w3i3mv.nmk b/mps/code/w3i3mv.nmk
index 604a16cb2bc..18f307dfbd9 100644
--- a/mps/code/w3i3mv.nmk
+++ b/mps/code/w3i3mv.nmk
@@ -5,9 +5,6 @@
 
 PFM = w3i3mv
 
-RAINBOWPATH = MSVISUAL\WIN32\I386
-DONGLELIB = $(RAINBOWPATH)\spromeps.lib
-
 # /Gs appears to be necessary to suppress stack checks.  Stack checks
 # (if not suppressed) generate a dependency on the C library, __chkesp,
 # which causes the linker step to fail when building the DLL, mpsdy.dll.
@@ -29,6 +26,8 @@ AMS = <poolams> <poolamsi>
 AWL = <poolawl>
 LO = <poollo>
 SNC = <poolsnc>
+MVFF = <poolmvff>
+N = <pooln>
 DW = <fmtdy> <fmtno>
 FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
 POOLN = <pooln>
@@ -52,145 +51,85 @@ CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT)
 MPMOBJ0 = $(MPM:<=w3i3mv\hot\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i3mv\hot\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\hot\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i3mv\hot\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i3mv\hot\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i3mv\hot\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i3mv\hot\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i3mv\hot\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i3mv\hot\)
 DWOBJ0 = $(DW:<=w3i3mv\hot\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\hot\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\hot\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\hot\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "di"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
 MPMOBJ0 = $(MPM:<=w3i3mv\di\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i3mv\di\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\di\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i3mv\di\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i3mv\di\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i3mv\di\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i3mv\di\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i3mv\di\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i3mv\di\)
 DWOBJ0 = $(DW:<=w3i3mv\di\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\di\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\di\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\di\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "cool"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL)
 MPMOBJ0 = $(MPM:<=w3i3mv\cool\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i3mv\cool\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\cool\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i3mv\cool\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i3mv\cool\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i3mv\cool\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i3mv\cool\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i3mv\cool\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i3mv\cool\)
 DWOBJ0 = $(DW:<=w3i3mv\cool\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\cool\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\cool\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\cool\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "ti"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI)
 MPMOBJ0 = $(MPM:<=w3i3mv\ti\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i3mv\ti\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\ti\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i3mv\ti\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i3mv\ti\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i3mv\ti\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i3mv\ti\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i3mv\ti\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i3mv\ti\)
 DWOBJ0 = $(DW:<=w3i3mv\ti\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\ti\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\ti\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\ti\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "we"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE)
 MPMOBJ0 = $(MPM:<=w3i3mv\we\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i3mv\we\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i3mv\we\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i3mv\we\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i3mv\we\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i3mv\we\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i3mv\we\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i3mv\we\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i3mv\we\)
 DWOBJ0 = $(DW:<=w3i3mv\we\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i3mv\we\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i3mv\we\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i3mv\we\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 #!ELSEIF "$(VARIETY)" == "cv"
 #CFLAGS=$(CFLAGSCOMMON) $(CFCV)
@@ -219,6 +158,19 @@ TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ENDIF
 
+MPMOBJ = $(MPMOBJ0:>=.obj)
+PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
+AMSOBJ = $(AMSOBJ0:>=.obj)
+AMCOBJ = $(AMCOBJ0:>=.obj)
+AWLOBJ = $(AWLOBJ0:>=.obj)
+LOOBJ = $(LOOBJ0:>=.obj)
+SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ = $(MVFFOBJ0:>=.obj)
+DWOBJ = $(DWOBJ0:>=.obj)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
+
 
 !INCLUDE commpost.nmk
 
diff --git a/mps/code/w3i6mv.nmk b/mps/code/w3i6mv.nmk
index 4bb3325f691..544427281d5 100644
--- a/mps/code/w3i6mv.nmk
+++ b/mps/code/w3i6mv.nmk
@@ -5,10 +5,6 @@
 
 PFM = w3i6mv
 
-# @@@@ Can we remove this? RB 2012-03-26
-RAINBOWPATH = MSVISUAL\WIN32\I386
-DONGLELIB = $(RAINBOWPATH)\spromeps.lib
-
 # /Gs appears to be necessary to suppress stack checks.  Stack checks
 # (if not suppressed) generate a dependency on the C library, __chkesp,
 # which causes the linker step to fail when building the DLL, mpsdy.dll.
@@ -31,6 +27,7 @@ AMS = <poolams> <poolamsi>
 AWL = <poolawl>
 LO = <poollo>
 SNC = <poolsnc>
+MVFF = <poolmvff>
 DW = <fmtdy> <fmtno>
 FMTTEST = <fmthe> <fmtdy> <fmtno> <fmtdytst>
 POOLN = <pooln>
@@ -54,145 +51,85 @@ CFLAGS=$(CFLAGSCOMMONPRE) $(CFHOT) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFHOT)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSHOT)
 MPMOBJ0 = $(MPM:<=w3i6mv\hot\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i6mv\hot\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\hot\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i6mv\hot\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i6mv\hot\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i6mv\hot\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i6mv\hot\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i6mv\hot\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i6mv\hot\)
 DWOBJ0 = $(DW:<=w3i6mv\hot\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\hot\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\hot\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\hot\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "di"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFDI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFDI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSDI)
 MPMOBJ0 = $(MPM:<=w3i6mv\di\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i6mv\di\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\di\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i6mv\di\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i6mv\di\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i6mv\di\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i6mv\di\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i6mv\di\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i6mv\di\)
 DWOBJ0 = $(DW:<=w3i6mv\di\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\di\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\di\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\di\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "cool"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFCOOL) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFCOOL)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSCOOL)
 MPMOBJ0 = $(MPM:<=w3i6mv\cool\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i6mv\cool\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\cool\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i6mv\cool\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i6mv\cool\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i6mv\cool\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i6mv\cool\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i6mv\cool\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i6mv\cool\)
 DWOBJ0 = $(DW:<=w3i6mv\cool\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\cool\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\cool\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\cool\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "ti"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFTI) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFTI)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSTI)
 MPMOBJ0 = $(MPM:<=w3i6mv\ti\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i6mv\ti\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\ti\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i6mv\ti\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i6mv\ti\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i6mv\ti\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i6mv\ti\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i6mv\ti\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i6mv\ti\)
 DWOBJ0 = $(DW:<=w3i6mv\ti\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\ti\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\ti\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\ti\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ELSEIF "$(VARIETY)" == "we"
 CFLAGS=$(CFLAGSCOMMONPRE) $(CFWE) $(CFLAGSCOMMONPOST)
 LINKFLAGS=$(LINKFLAGSCOMMON) $(LFWE)
 LIBFLAGS=$(LIBFLAGSCOMMON) $(LIBFLAGSWE)
 MPMOBJ0 = $(MPM:<=w3i6mv\we\)
-MPMOBJ = $(MPMOBJ0:>=.obj)
 PLINTHOBJ0 = $(PLINTH:<=w3i6mv\we\)
-PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
-SWOBJ0 = $(SW:<=w3i6mv\we\)
-SWOBJ = $(SWOBJ0:>=.obj)
 AMSOBJ0 = $(AMS:<=w3i6mv\we\)
-AMSOBJ = $(AMSOBJ0:>=.obj)
 AMCOBJ0 = $(AMC:<=w3i6mv\we\)
-AMCOBJ = $(AMCOBJ0:>=.obj)
 AWLOBJ0 = $(AWL:<=w3i6mv\we\)
-AWLOBJ = $(AWLOBJ0:>=.obj)
 LOOBJ0 = $(LO:<=w3i6mv\we\)
-LOOBJ = $(LOOBJ0:>=.obj)
 SNCOBJ0 = $(SNC:<=w3i6mv\we\)
-SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ0 = $(MVFF:<=w3i6mv\we\)
 DWOBJ0 = $(DW:<=w3i6mv\we\)
-DWOBJ = $(DWOBJ0:>=.obj)
 FMTTESTOBJ0 = $(FMTTEST:<=w3i6mv\we\)
-FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
 POOLNOBJ0 = $(POOLN:<=w3i6mv\we\)
-POOLNOBJ = $(POOLNOBJ0:>=.obj)
 TESTLIBOBJ0 = $(TESTLIB:<=w3i6mv\we\)
-TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 #!ELSEIF "$(VARIETY)" == "cv"
 #CFLAGS=$(CFLAGSCOMMON) $(CFCV)
@@ -221,6 +158,19 @@ TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
 
 !ENDIF
 
+MPMOBJ = $(MPMOBJ0:>=.obj)
+PLINTHOBJ = $(PLINTHOBJ0:>=.obj)
+AMSOBJ = $(AMSOBJ0:>=.obj)
+AMCOBJ = $(AMCOBJ0:>=.obj)
+AWLOBJ = $(AWLOBJ0:>=.obj)
+LOOBJ = $(LOOBJ0:>=.obj)
+SNCOBJ = $(SNCOBJ0:>=.obj)
+MVFFOBJ = $(MVFFOBJ0:>=.obj)
+DWOBJ = $(DWOBJ0:>=.obj)
+FMTTESTOBJ = $(FMTTESTOBJ0:>=.obj)
+POOLNOBJ = $(POOLNOBJ0:>=.obj)
+TESTLIBOBJ = $(TESTLIBOBJ0:>=.obj)
+
 
 !INCLUDE commpost.nmk
 
-- 
cgit v1.2.1