diff --git a/src/finiteVolume/cfdTools/general/bound/bound.C b/src/finiteVolume/cfdTools/general/bound/bound.C
index 7054434c0f..93dac0faf9 100644
--- a/src/finiteVolume/cfdTools/general/bound/bound.C
+++ b/src/finiteVolume/cfdTools/general/bound/bound.C
@@ -30,7 +30,8 @@ License
 
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
-void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
+Foam::volScalarField&
+Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
 {
     const scalar minVsf = min(vsf).value();
 
@@ -55,6 +56,8 @@ void Foam::bound(volScalarField& vsf, const dimensionedScalar& lowerBound)
 
         vsf.boundaryField() = max(vsf.boundaryField(), lowerBound.value());
     }
+
+    return vsf;
 }
 
 
diff --git a/src/finiteVolume/cfdTools/general/bound/bound.H b/src/finiteVolume/cfdTools/general/bound/bound.H
index f301c5a217..1f6418ce5c 100644
--- a/src/finiteVolume/cfdTools/general/bound/bound.H
+++ b/src/finiteVolume/cfdTools/general/bound/bound.H
@@ -50,8 +50,9 @@ namespace Foam
 // * * * * * * * * * * * * * * * Global Functions  * * * * * * * * * * * * * //
 
 //- Bound the given scalar field if it has gone unbounded.
+//  Return the bounded field.
 //  Used extensively in RAS and LES turbulence models.
-void bound(volScalarField&, const dimensionedScalar& lowerBound);
+volScalarField& bound(volScalarField&, const dimensionedScalar& lowerBound);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index 556ee0ca51..284d28a973 100644
--- a/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -83,7 +83,7 @@ LESModel::LESModel
 
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
-    readIfPresent("kMin", kMin_);
+    kMin_.readIfPresent(*this);
 
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs
diff --git a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index 2c35c3cec0..f802f29a22 100644
--- a/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -87,6 +87,10 @@ RASModel::RASModel
 
     y_(mesh_)
 {
+    kMin_.readIfPresent(*this);
+    epsilonMin_.readIfPresent(*this);
+    omegaMin_.readIfPresent(*this);
+
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs
     mesh_.deltaCoeffs();
diff --git a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index 34966eb22c..5173c899c8 100644
--- a/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -81,7 +81,7 @@ LESModel::LESModel
     kMin_("kMin", sqr(dimVelocity), SMALL),
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
-    readIfPresent("kMin", kMin_);
+    kMin_.readIfPresent(*this);
 
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index 708c090351..fe3a1b8ed6 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -323,6 +323,8 @@ kOmegaSSTSAS::kOmegaSSTSAS
         mesh_
     )
 {
+    omegaMin_.readIfPresent(*this);
+
     bound(k_, kMin_);
     bound(omega_, omegaMin_);
 
@@ -458,6 +460,8 @@ bool kOmegaSSTSAS::read()
         zetaTilda2_.readIfPresent(coeffDict());
         FSAS_.readIfPresent(coeffDict());
 
+        omegaMin_.readIfPresent(*this);
+
         return true;
     }
     else
diff --git a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 5f036cff10..5212e7bbad 100644
--- a/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -119,7 +119,7 @@ LamBremhorstKE::LamBremhorstKE
 
     y_(mesh_),
 
-    Rt_(sqr(k_)/(nu()*epsilon_)),
+    Rt_(sqr(k_)/(nu()*bound(epsilon_, epsilonMin_))),
 
     fMu_
     (
@@ -141,7 +141,7 @@ LamBremhorstKE::LamBremhorstKE
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     nut_ = Cmu_*fMu_*sqr(k_)/epsilon_;
     nut_.correctBoundaryConditions();
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index d91f974fbe..c5c783f125 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -173,12 +173,12 @@ LienCubicKE::LienCubicKE
     gradU_(fvc::grad(U)),
     eta_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/bound(epsilon_, epsilonMin_)
        *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T())))
     ),
     ksi_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/epsilon_
        *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T())))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
@@ -235,7 +235,7 @@ LienCubicKE::LienCubicKE
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
     nut_.correctBoundaryConditions();
diff --git a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 046f5a6fa1..afd85ff475 100644
--- a/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -222,12 +222,12 @@ LienCubicKELowRe::LienCubicKELowRe
     gradU_(fvc::grad(U)),
     eta_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/bound(epsilon_, epsilonMin_)
        *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T())))
     ),
     ksi_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/epsilon_
        *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T())))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
@@ -235,7 +235,7 @@ LienCubicKELowRe::LienCubicKELowRe
 
     C5viscosity_
     (
-        -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_ + epsilonMin_)
+        -2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
        *(magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T()))
     ),
 
@@ -260,7 +260,7 @@ LienCubicKELowRe::LienCubicKELowRe
         symm
         (
             // quadratic terms
-            pow3(k_)/sqr(epsilon_ + epsilonMin_)
+            pow3(k_)/sqr(epsilon_)
            *(
                 Ctau1_/fEta_
                *(
@@ -271,7 +271,7 @@ LienCubicKELowRe::LienCubicKELowRe
               + Ctau3_/fEta_*(gradU_.T() & gradU_)
             )
             // cubic term C4
-          - 20.0*pow4(k_)/pow3(epsilon_ + epsilonMin_)
+          - 20.0*pow4(k_)/pow3(epsilon_)
            *pow3(Cmu_)
            *(
                 ((gradU_ & gradU_) & gradU_.T())
@@ -289,7 +289,7 @@ LienCubicKELowRe::LienCubicKELowRe
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     nut_ = Cmu_
       * (scalar(1) - exp(-Am_*yStar_))
diff --git a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index c885d87f16..fdcae3d187 100644
--- a/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -192,25 +192,25 @@ NonlinearKEShih::NonlinearKEShih
     gradU_(fvc::grad(U)),
     eta_
     (
-        k_/(epsilon_ + epsilonMin_)
+        k_/bound(epsilon_, epsilonMin_)
        *sqrt(2.0*magSqr(0.5*(gradU_ + gradU_.T())))
     ),
     ksi_
     (
-        k_/(epsilon_+ epsilonMin_)
+        k_/epsilon_
        *sqrt(2.0*magSqr(0.5*(gradU_ - gradU_.T())))
     ),
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
     fEta_(A2_ + pow(eta_, 3.0)),
 
-    nut_("nut", Cmu_*sqr(k_)/(epsilon_ + epsilonMin_)),
+    nut_("nut", Cmu_*sqr(k_)/epsilon_),
 
     nonlinearStress_
     (
         "nonlinearStress",
         symm
         (
-            pow3(k_)/sqr(epsilon_ + epsilonMin_)
+            pow3(k_)/sqr(epsilon_)
            *(
                 Ctau1_/fEta_
                *(
@@ -224,7 +224,7 @@ NonlinearKEShih::NonlinearKEShih
     )
 {
     bound(k_, kMin_);
-    bound(epsilon_, epsilonMin_);
+    // already bounded: bound(epsilon_, epsilonMin_);
 
     #include "wallNonlinearViscosityI.H"
 
diff --git a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index c7d97e08e9..8e1da1e5b5 100644
--- a/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -86,6 +86,10 @@ RASModel::RASModel
 
     y_(mesh_)
 {
+    kMin_.readIfPresent(*this);
+    epsilonMin_.readIfPresent(*this);
+    omegaMin_.readIfPresent(*this);
+
     // Force the construction of the mesh deltaCoeffs which may be needed
     // for the construction of the derived models and BCs
     mesh_.deltaCoeffs();
diff --git a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index 422f8b1463..41b1114429 100644
--- a/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -179,7 +179,7 @@ qZeta::qZeta
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        epsilon_/(2.0*q_),
+        epsilon_/(2.0*bound(q_, qMin_)),
         epsilon_.boundaryField().types()
     ),
 
@@ -198,7 +198,7 @@ qZeta::qZeta
 {
     bound(k_, kMin_);
     bound(epsilon_, epsilonMin_);
-    bound(q_, qMin_);
+    // already bounded: bound(q_, qMin_);
     bound(zeta_, zetaMin_);
 
     nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
diff --git a/wmake/rules/General/X b/wmake/rules/General/X
new file mode 100644
index 0000000000..f55fa8b32c
--- /dev/null
+++ b/wmake/rules/General/X
@@ -0,0 +1,5 @@
+# X11 includes and libraries in the standard location
+#
+XFLAGS     =
+XINC       = $(XFLAGS) -I/usr/include/X11
+XLIBS      = -lXext -lX11
diff --git a/wmake/rules/General/flex b/wmake/rules/General/flex
index 06defbb03d..7f726b34c4 100644
--- a/wmake/rules/General/flex
+++ b/wmake/rules/General/flex
@@ -1,6 +1,6 @@
 .SUFFIXES: .l
 
-ltoo = flex $$SOURCE ; mv lex.yy.c $*.c ; $(cc) $(cFLAGS) -c $*.c -o $@ 
+ltoo = flex -o $*.c $$SOURCE ; $(cc) $(cFLAGS) -c $*.c -o $@
 
 .l.dep:
 	$(MAKE_DEP)
diff --git a/wmake/rules/General/flex++ b/wmake/rules/General/flex++
index 304b131c6d..7e7142aa53 100644
--- a/wmake/rules/General/flex++
+++ b/wmake/rules/General/flex++
@@ -1,6 +1,6 @@
 .SUFFIXES: .L
 
-Ltoo = flex -+ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@
+Ltoo = flex -+ -o $*.C -f $$SOURCE ; $(CC) $(c++FLAGS) -c $*.C -o $@
 
 .L.dep:
 	$(MAKE_DEP)
diff --git a/wmake/rules/General/flex++.test b/wmake/rules/General/flex++.test
deleted file mode 100644
index 8503e57905..0000000000
--- a/wmake/rules/General/flex++.test
+++ /dev/null
@@ -1,6 +0,0 @@
-.SUFFIXES: .L
-
-Ltoo = flex++ $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
-
-.L.dep:
-	$(MAKE_DEP)
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index 419d9b1d38..d0253e80b3 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -1,6 +1,7 @@
 AR         = ar
 ARFLAGS    = cr
 RANLIB     = ranlib
+CPP        = cpp
 LD         = ld
 
 GFLAGS     = -D$(WM_ARCH) -DWM_$(WM_PRECISION_OPTION)
diff --git a/wmake/rules/linux64Gcc42/mplib b/wmake/rules/General/mplib
similarity index 100%
rename from wmake/rules/linux64Gcc42/mplib
rename to wmake/rules/General/mplib
diff --git a/wmake/rules/linux64Gcc42/mplibGAMMA b/wmake/rules/General/mplibGAMMA
similarity index 100%
rename from wmake/rules/linux64Gcc42/mplibGAMMA
rename to wmake/rules/General/mplibGAMMA
diff --git a/wmake/rules/General/mplibMPICH b/wmake/rules/General/mplibMPICH
index ac17f7c1d2..e5a38a8e38 100644
--- a/wmake/rules/General/mplibMPICH
+++ b/wmake/rules/General/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc42/mplibMPICH-GM b/wmake/rules/General/mplibMPICH-GM
similarity index 100%
rename from wmake/rules/linux64Gcc42/mplibMPICH-GM
rename to wmake/rules/General/mplibMPICH-GM
diff --git a/wmake/rules/linux64Gcc42/mplibOPENMPI b/wmake/rules/General/mplibQSMPI
similarity index 71%
rename from wmake/rules/linux64Gcc42/mplibOPENMPI
rename to wmake/rules/General/mplibQSMPI
index 834d2d3e22..95ea327379 100644
--- a/wmake/rules/linux64Gcc42/mplibOPENMPI
+++ b/wmake/rules/General/mplibQSMPI
@@ -1,3 +1,4 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
+PFLAGS     =
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
+
diff --git a/wmake/rules/SiCortex64Gcc/flex++ b/wmake/rules/SiCortex64Gcc/flex++
deleted file mode 100644
index d745628aab..0000000000
--- a/wmake/rules/SiCortex64Gcc/flex++
+++ /dev/null
@@ -1,6 +0,0 @@
-.SUFFIXES: .L
-
-Ltoo = flex --c++ -f $$SOURCE ; mv lex.yy.cc $*.C ; $(CC) $(c++FLAGS) -c $*.C -o $@ 
-
-.L.dep:
-	$(MAKE_DEP)
diff --git a/wmake/rules/SiCortex64Gcc/general b/wmake/rules/SiCortex64Gcc/general
index d70a77cdb0..eb820ab36d 100644
--- a/wmake/rules/SiCortex64Gcc/general
+++ b/wmake/rules/SiCortex64Gcc/general
@@ -1,4 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -A64
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/SiCortex64Gcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/SiCortex64Gcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/general b/wmake/rules/SunOS64Gcc/general
index f9b5632198..d24e8f0056 100644
--- a/wmake/rules/SunOS64Gcc/general
+++ b/wmake/rules/SunOS64Gcc/general
@@ -1,4 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS)
+CPP        = /lib/cpp
 LD         = ld -64
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/SunOS64Gcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/SunOS64Gcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/SunOS64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/SunOS64Gcc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X
deleted file mode 100644
index 47480abd22..0000000000
--- a/wmake/rules/linux64Gcc/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/include/X11
-XLIBS      = -L/usr/lib64 -lXext -lX11
diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linux64Gcc/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/dirToString b/wmake/rules/linux64Gcc/dirToString
deleted file mode 100755
index 8a0125352d..0000000000
Binary files a/wmake/rules/linux64Gcc/dirToString and /dev/null differ
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 10237bd1b6..7285501d98 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/linux64Gcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA
deleted file mode 100644
index 11606f2984..0000000000
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linux64Gcc/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linux64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI
deleted file mode 100644
index 95ea327379..0000000000
--- a/wmake/rules/linux64Gcc/mplibQSMPI
+++ /dev/null
@@ -1,4 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
-
diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI
new file mode 120000
index 0000000000..d3446c68f1
--- /dev/null
+++ b/wmake/rules/linux64Gcc/mplibQSMPI
@@ -0,0 +1 @@
+../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/wmkdep b/wmake/rules/linux64Gcc/wmkdep
deleted file mode 100755
index 949570b0ba..0000000000
Binary files a/wmake/rules/linux64Gcc/wmkdep and /dev/null differ
diff --git a/wmake/rules/linux64Gcc42/X b/wmake/rules/linux64Gcc42/X
deleted file mode 100644
index 5d1f9c5cc5..0000000000
--- a/wmake/rules/linux64Gcc42/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/linux64Gcc42/c b/wmake/rules/linux64Gcc42/c
deleted file mode 100644
index 80bb80f32f..0000000000
--- a/wmake/rules/linux64Gcc42/c
+++ /dev/null
@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = gcc -m64
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linux64Gcc42/c++ b/wmake/rules/linux64Gcc42/c++
deleted file mode 100644
index 677b1e5bb4..0000000000
--- a/wmake/rules/linux64Gcc42/c++
+++ /dev/null
@@ -1,21 +0,0 @@
-.SUFFIXES: .C .cxx .cc .cpp
-
-c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
-
-CC          = g++ -m64
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared
-LINKEXE     = $(CC) $(c++FLAGS)
diff --git a/wmake/rules/linux64Gcc42/c++Debug b/wmake/rules/linux64Gcc42/c++Debug
deleted file mode 100644
index 19bdb9c334..0000000000
--- a/wmake/rules/linux64Gcc42/c++Debug
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linux64Gcc42/c++Opt b/wmake/rules/linux64Gcc42/c++Opt
deleted file mode 100644
index 3446f7f58c..0000000000
--- a/wmake/rules/linux64Gcc42/c++Opt
+++ /dev/null
@@ -1,4 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
-#c++OPT      = -march=nocona -O3
-# -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/linux64Gcc42/c++Prof b/wmake/rules/linux64Gcc42/c++Prof
deleted file mode 100644
index 3bda4dad55..0000000000
--- a/wmake/rules/linux64Gcc42/c++Prof
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
diff --git a/wmake/rules/linux64Gcc42/cDebug b/wmake/rules/linux64Gcc42/cDebug
deleted file mode 100644
index 72b638f458..0000000000
--- a/wmake/rules/linux64Gcc42/cDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -fdefault-inline -finline-functions
diff --git a/wmake/rules/linux64Gcc42/cOpt b/wmake/rules/linux64Gcc42/cOpt
deleted file mode 100644
index 17318709f1..0000000000
--- a/wmake/rules/linux64Gcc42/cOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
diff --git a/wmake/rules/linux64Gcc42/cProf b/wmake/rules/linux64Gcc42/cProf
deleted file mode 100644
index ca3ac9bf5f..0000000000
--- a/wmake/rules/linux64Gcc42/cProf
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
diff --git a/wmake/rules/linux64Gcc42/dirToString b/wmake/rules/linux64Gcc42/dirToString
deleted file mode 100755
index 0560cadf77..0000000000
Binary files a/wmake/rules/linux64Gcc42/dirToString and /dev/null differ
diff --git a/wmake/rules/linux64Gcc42/general b/wmake/rules/linux64Gcc42/general
deleted file mode 100644
index d70a77cdb0..0000000000
--- a/wmake/rules/linux64Gcc42/general
+++ /dev/null
@@ -1,10 +0,0 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld -A64
-
-PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
diff --git a/wmake/rules/linux64Gcc42/mplibHPMPI b/wmake/rules/linux64Gcc42/mplibHPMPI
deleted file mode 100644
index 574492a236..0000000000
--- a/wmake/rules/linux64Gcc42/mplibHPMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_amd64 -lmpi
diff --git a/wmake/rules/linux64Gcc42/mplibMPICH b/wmake/rules/linux64Gcc42/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linux64Gcc42/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c3..0000000000
--- a/wmake/rules/linux64Gcc42/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc42/wmkdep b/wmake/rules/linux64Gcc42/wmkdep
deleted file mode 100755
index f37b2ea3d3..0000000000
Binary files a/wmake/rules/linux64Gcc42/wmkdep and /dev/null differ
diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X
deleted file mode 100644
index 5d1f9c5cc5..0000000000
--- a/wmake/rules/linux64Gcc43/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general
index 10237bd1b6..7285501d98 100644
--- a/wmake/rules/linux64Gcc43/general
+++ b/wmake/rules/linux64Gcc43/general
@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/linux64Gcc43/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
deleted file mode 100644
index 11606f2984..0000000000
--- a/wmake/rules/linux64Gcc43/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linux64Gcc43/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linux64Gcc43/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linux64Gcc43/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI
deleted file mode 100644
index 95ea327379..0000000000
--- a/wmake/rules/linux64Gcc43/mplibQSMPI
+++ /dev/null
@@ -1,4 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
-
diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI
new file mode 120000
index 0000000000..d3446c68f1
--- /dev/null
+++ b/wmake/rules/linux64Gcc43/mplibQSMPI
@@ -0,0 +1 @@
+../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X
deleted file mode 100644
index 5d1f9c5cc5..0000000000
--- a/wmake/rules/linux64Gcc44/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general
index 10237bd1b6..7285501d98 100644
--- a/wmake/rules/linux64Gcc44/general
+++ b/wmake/rules/linux64Gcc44/general
@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/linux64Gcc44/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA
deleted file mode 100644
index 11606f2984..0000000000
--- a/wmake/rules/linux64Gcc44/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linux64Gcc44/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linux64Gcc44/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linux64Gcc44/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI
deleted file mode 100644
index 95ea327379..0000000000
--- a/wmake/rules/linux64Gcc44/mplibQSMPI
+++ /dev/null
@@ -1,4 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
-
diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI
new file mode 120000
index 0000000000..d3446c68f1
--- /dev/null
+++ b/wmake/rules/linux64Gcc44/mplibQSMPI
@@ -0,0 +1 @@
+../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X
deleted file mode 100644
index 5d1f9c5cc5..0000000000
--- a/wmake/rules/linux64Icc/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib64 -lXext -lX11
diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linux64Icc/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general
index 10237bd1b6..7285501d98 100644
--- a/wmake/rules/linux64Icc/general
+++ b/wmake/rules/linux64Icc/general
@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
diff --git a/wmake/rules/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/linux64Icc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linux64Icc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linux64Icc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linux64Icc/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linux64Icc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linux64Icc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X
deleted file mode 100644
index bed8bfeddf..0000000000
--- a/wmake/rules/linuxGcc/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linuxGcc/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/dirToString b/wmake/rules/linuxGcc/dirToString
deleted file mode 100755
index f2244e3dca..0000000000
Binary files a/wmake/rules/linuxGcc/dirToString and /dev/null differ
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index 02ad6973ff..c19ca19394 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -1,4 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/linuxGcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxGcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA
deleted file mode 100644
index 11606f2984..0000000000
--- a/wmake/rules/linuxGcc/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linuxGcc/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linuxGcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxGcc/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linuxGcc/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linuxGcc/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxGcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxGcc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/wmkdep b/wmake/rules/linuxGcc/wmkdep
deleted file mode 100755
index ca4e0a882f..0000000000
Binary files a/wmake/rules/linuxGcc/wmkdep and /dev/null differ
diff --git a/wmake/rules/linuxGcc42/X b/wmake/rules/linuxGcc42/X
deleted file mode 100644
index bed8bfeddf..0000000000
--- a/wmake/rules/linuxGcc42/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/linuxGcc42/c b/wmake/rules/linuxGcc42/c
deleted file mode 100644
index 8db5da1047..0000000000
--- a/wmake/rules/linuxGcc42/c
+++ /dev/null
@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = gcc -m32
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -shared
-LINKEXE     = $(cc) -Xlinker -z -Xlinker nodefs
diff --git a/wmake/rules/linuxGcc42/c++ b/wmake/rules/linuxGcc42/c++
deleted file mode 100644
index 32d12ad9de..0000000000
--- a/wmake/rules/linuxGcc42/c++
+++ /dev/null
@@ -1,21 +0,0 @@
-.SUFFIXES: .C .cxx .cc .cpp
-
-c++WARN     = -Wall -Wno-strict-aliasing -Wextra -Wno-unused-parameter -Wold-style-cast
-
-CC          = g++ -m32
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-60
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC -pthread
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-LINKLIBSO   = $(CC) $(c++FLAGS) -shared
-LINKEXE     = $(CC) $(c++FLAGS)
diff --git a/wmake/rules/linuxGcc42/c++Debug b/wmake/rules/linuxGcc42/c++Debug
deleted file mode 100644
index 19bdb9c334..0000000000
--- a/wmake/rules/linuxGcc42/c++Debug
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxGcc42/c++Opt b/wmake/rules/linuxGcc42/c++Opt
deleted file mode 100644
index 2aedabd628..0000000000
--- a/wmake/rules/linuxGcc42/c++Opt
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3
diff --git a/wmake/rules/linuxGcc42/c++Prof b/wmake/rules/linuxGcc42/c++Prof
deleted file mode 100644
index 3bda4dad55..0000000000
--- a/wmake/rules/linuxGcc42/c++Prof
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
diff --git a/wmake/rules/linuxGcc42/cDebug b/wmake/rules/linuxGcc42/cDebug
deleted file mode 100644
index 6c71ed93e8..0000000000
--- a/wmake/rules/linuxGcc42/cDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -finline-functions
diff --git a/wmake/rules/linuxGcc42/cOpt b/wmake/rules/linuxGcc42/cOpt
deleted file mode 100644
index 17318709f1..0000000000
--- a/wmake/rules/linuxGcc42/cOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3
diff --git a/wmake/rules/linuxGcc42/cProf b/wmake/rules/linuxGcc42/cProf
deleted file mode 100644
index ca3ac9bf5f..0000000000
--- a/wmake/rules/linuxGcc42/cProf
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
diff --git a/wmake/rules/linuxGcc42/general b/wmake/rules/linuxGcc42/general
deleted file mode 100644
index c300368ee6..0000000000
--- a/wmake/rules/linuxGcc42/general
+++ /dev/null
@@ -1,10 +0,0 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld -melf_i386
-
-PROJECT_LIBS = -l$(WM_PROJECT) -ldl
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc42/mplib b/wmake/rules/linuxGcc42/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/linuxGcc42/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/linuxGcc42/mplibGAMMA b/wmake/rules/linuxGcc42/mplibGAMMA
deleted file mode 100644
index 11606f2984..0000000000
--- a/wmake/rules/linuxGcc42/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc42/mplibHPMPI b/wmake/rules/linuxGcc42/mplibHPMPI
deleted file mode 100644
index 8aff40632b..0000000000
--- a/wmake/rules/linuxGcc42/mplibHPMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include -D_MPICC_H
-PLIBS      = -L$(MPI_ARCH_PATH)/lib/linux_ia32 -lmpi
diff --git a/wmake/rules/linuxGcc42/mplibMPICH b/wmake/rules/linuxGcc42/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linuxGcc42/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc42/mplibMPICH-GM b/wmake/rules/linuxGcc42/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linuxGcc42/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc42/mplibOPENMPI b/wmake/rules/linuxGcc42/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxGcc42/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c3..0000000000
--- a/wmake/rules/linuxGcc42/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X
deleted file mode 100644
index bed8bfeddf..0000000000
--- a/wmake/rules/linuxGcc43/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linuxGcc43/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general
index 02ad6973ff..c19ca19394 100644
--- a/wmake/rules/linuxGcc43/general
+++ b/wmake/rules/linuxGcc43/general
@@ -1,4 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/linuxGcc43/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
deleted file mode 100644
index 11606f2984..0000000000
--- a/wmake/rules/linuxGcc43/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linuxGcc43/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linuxGcc43/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxGcc43/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxGcc43/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X
deleted file mode 100644
index bed8bfeddf..0000000000
--- a/wmake/rules/linuxGcc44/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linuxGcc44/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general
index 02ad6973ff..c19ca19394 100644
--- a/wmake/rules/linuxGcc44/general
+++ b/wmake/rules/linuxGcc44/general
@@ -1,4 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib
deleted file mode 100644
index 294bd86150..0000000000
--- a/wmake/rules/linuxGcc44/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       =
-PLIBS      =
diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA
deleted file mode 100644
index 11606f2984..0000000000
--- a/wmake/rules/linuxGcc44/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linuxGcc44/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linuxGcc44/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxGcc44/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxGcc44/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/general b/wmake/rules/linuxIA64Gcc/general
index 10237bd1b6..7285501d98 100644
--- a/wmake/rules/linuxIA64Gcc/general
+++ b/wmake/rules/linuxIA64Gcc/general
@@ -1,6 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
-LD         = ld
-
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/linuxIA64Gcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxIA64Gcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linuxIA64Gcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxIA64Gcc/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/general b/wmake/rules/linuxIA64Icc/general
index 8d72138115..66953a9652 100644
--- a/wmake/rules/linuxIA64Icc/general
+++ b/wmake/rules/linuxIA64Icc/general
@@ -1,8 +1,4 @@
-CPP        = /lib/cpp $(GFLAGS) -DICC_IA64_PREFETCH
-AR         = ar
-ARFLAGS    = cr
-RANLIB     = ranlib
-LD         = ld
+CPP        = cpp -DICC_IA64_PREFETCH
 
 GLIBS      = -liberty
 
diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/linuxIA64Icc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxIA64Icc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linuxIA64Icc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxIA64Icc/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxIA64Icc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxIA64Icc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X
deleted file mode 100644
index bed8bfeddf..0000000000
--- a/wmake/rules/linuxIcc/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       = $(XFLAGS) -I/usr/X11R6/include
-XLIBS      = -L/usr/X11R6/lib -lXext -lX11
diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X
new file mode 120000
index 0000000000..73572d6c04
--- /dev/null
+++ b/wmake/rules/linuxIcc/X
@@ -0,0 +1 @@
+../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general
index 02ad6973ff..c19ca19394 100644
--- a/wmake/rules/linuxIcc/general
+++ b/wmake/rules/linuxIcc/general
@@ -1,4 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -melf_i386
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/linuxIcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxIcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
deleted file mode 100644
index e5a38a8e38..0000000000
--- a/wmake/rules/linuxIcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DMPICH_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxIcc/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxIcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxIcc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/general b/wmake/rules/linuxPPC64Gcc/general
index 76d507634a..81927e682b 100644
--- a/wmake/rules/linuxPPC64Gcc/general
+++ b/wmake/rules/linuxPPC64Gcc/general
@@ -1,4 +1,3 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = ld -m elf64ppc
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/linuxPPC64Gcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA
deleted file mode 100644
index d62c6250ff..0000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH
deleted file mode 100644
index ac17f7c1d2..0000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI
deleted file mode 100644
index 95ea327379..0000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibQSMPI
+++ /dev/null
@@ -1,4 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
-
diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI
new file mode 120000
index 0000000000..d3446c68f1
--- /dev/null
+++ b/wmake/rules/linuxPPC64Gcc/mplibQSMPI
@@ -0,0 +1 @@
+../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general
index 6a37beabd4..26658e0c98 100644
--- a/wmake/rules/linuxmingw32/general
+++ b/wmake/rules/linuxmingw32/general
@@ -1,18 +1,10 @@
-CPP        = /lib/cpp $(GFLAGS)
 LD         = mingw32-ld
 
 PROJECT_LIBS = -l$(WM_PROJECT)
 
+include $(GENERAL_RULES)/standard
+
 include $(RULES)/X
-
-include $(GENERAL_RULES)/sourceToDep
-
-include $(GENERAL_RULES)/flex
-include $(GENERAL_RULES)/flex++
-include $(GENERAL_RULES)/byacc
-include $(GENERAL_RULES)/btyacc++
-include $(GENERAL_RULES)/moc
-
 include $(RULES)/c
 include $(RULES)/c++
 
diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/linuxmingw32/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/linuxmingw32/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA
deleted file mode 100644
index d62c6250ff..0000000000
--- a/wmake/rules/linuxmingw32/mplibGAMMA
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lgamma
diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA
new file mode 120000
index 0000000000..4b41692bf6
--- /dev/null
+++ b/wmake/rules/linuxmingw32/mplibGAMMA
@@ -0,0 +1 @@
+../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH
deleted file mode 100644
index ac17f7c1d2..0000000000
--- a/wmake/rules/linuxmingw32/mplibMPICH
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt
diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH
new file mode 120000
index 0000000000..c83eb564e1
--- /dev/null
+++ b/wmake/rules/linuxmingw32/mplibMPICH
@@ -0,0 +1 @@
+../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM
deleted file mode 100644
index 88493ebc70..0000000000
--- a/wmake/rules/linuxmingw32/mplibMPICH-GM
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     =
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -L$(GM_LIB_PATH) -lgm
diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM
new file mode 120000
index 0000000000..621d0857d3
--- /dev/null
+++ b/wmake/rules/linuxmingw32/mplibMPICH-GM
@@ -0,0 +1 @@
+../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/linuxmingw32/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/linuxmingw32/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/general b/wmake/rules/solarisGcc/general
index 712af78559..c8641ef7e5 100644
--- a/wmake/rules/solarisGcc/general
+++ b/wmake/rules/solarisGcc/general
@@ -1,4 +1,4 @@
-CPP        = /usr/lib/cpp -undef $(GFLAGS)
+CPP        = /usr/lib/cpp -undef
 
 PROJECT_LIBS = -l$(WM_PROJECT) -liberty -lnsl -lsocket -L$(FOAM_LIBBIN)/dummy -lPstream
 
diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib
deleted file mode 100644
index 8a84b40146..0000000000
--- a/wmake/rules/solarisGcc/mplib
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = 
-PINC       = 
-PLIBS      = 
diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib
new file mode 120000
index 0000000000..1fa0d64ec8
--- /dev/null
+++ b/wmake/rules/solarisGcc/mplib
@@ -0,0 +1 @@
+../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplibMPICH b/wmake/rules/solarisGcc/mplibMPICH
index cd9ff0e478..c4ef548d9a 100644
--- a/wmake/rules/solarisGcc/mplibMPICH
+++ b/wmake/rules/solarisGcc/mplibMPICH
@@ -1,3 +1,3 @@
-PFLAGS     = 
+PFLAGS     = -DMPICH_SKIP_MPICXX
 PINC       = -I$(MPI_ARCH_PATH)/include
 PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpich -lrt -laio
diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI
deleted file mode 100644
index 834d2d3e22..0000000000
--- a/wmake/rules/solarisGcc/mplibOPENMPI
+++ /dev/null
@@ -1,3 +0,0 @@
-PFLAGS     = -DOMPI_SKIP_MPICXX
-PINC       = -I$(MPI_ARCH_PATH)/include
-PLIBS      = -L$(MPI_ARCH_PATH)/lib -lmpi
diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI
new file mode 120000
index 0000000000..2d938a16a6
--- /dev/null
+++ b/wmake/rules/solarisGcc/mplibOPENMPI
@@ -0,0 +1 @@
+../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/scripts/makeDerivedFiles b/wmake/scripts/makeDerivedFiles
index 96377d6832..9d574fe0f9 100755
--- a/wmake/scripts/makeDerivedFiles
+++ b/wmake/scripts/makeDerivedFiles
@@ -28,7 +28,7 @@
 #
 # Description
 #     Constructs all the file list for make given the source file list,
-#     written was by hand or using makeFilesAndOptions.
+#     written by hand or using makeFilesAndOptions.
 #
 #------------------------------------------------------------------------------
 
diff --git a/wmake/scripts/makeFiles b/wmake/scripts/makeFiles
index 8416970039..14c0921515 100755
--- a/wmake/scripts/makeFiles
+++ b/wmake/scripts/makeFiles
@@ -35,41 +35,38 @@
 
 if [ -r Make/files ]
 then
-    echo "makeFiles: Make/files already exists, exiting"
+    echo "Error: Make/files already exists - exiting"
     exit 1
 fi
 
-bin=$WM_DIR/bin/$WM_ARCH$WM_COMPILER
+dirToString=$WM_DIR/bin/$WM_ARCH$WM_COMPILER/dirToString
 
 [ -d Make ] || mkdir Make
 rm -f Make/files
 
-dirs=`find . -name "*" -type d -print`
-
-for dir in $dirs
+for dir in `find . -type d -print`
 do
-    if [ $dir != . ]
-    then
+    case "$dir" in
+    . | ./Make | ./lnInclude )
+        # skip special directories
+        ;;
+    *)
         baseDir=`echo $dir | sed 's%^\./%%'`
-        baseDirName=`echo $baseDir | $bin/dirToString`
+        baseDirName=`echo $baseDir | $dirToString`
 
-        if [ $baseDirName != Make ]
-        then
-            echo $baseDirName " = " $baseDir >> Make/files
-        fi
-    fi
+        echo $baseDirName " = " $baseDir >> Make/files
+        ;;
+    esac
 done
 
 echo >> Make/files
 
-files=`find . -name "*.[cCylfF]" -type f  -print`
-
-for file in $files
+for file in `find . -name "*.[cCylLfF]" -type f -print`
 do
-    pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $bin/dirToString`
     fileName=`echo ${file##*/}`
+    pathName=`echo ${file%/*} | sed 's%^\.%%' | sed 's%^/%%' | $dirToString`
 
-    if [ "$pathName" != "" ]
+    if [ -n "$pathName" ]
     then
         echo '$('$pathName')/'$fileName >> Make/files
     else
diff --git a/wmake/scripts/makeOptions b/wmake/scripts/makeOptions
index 609a447ba0..4d813840e0 100755
--- a/wmake/scripts/makeOptions
+++ b/wmake/scripts/makeOptions
@@ -27,7 +27,7 @@
 #     makeOptions
 #
 # Description
-#     Scan the current directory for options and construct Make/options
+#     Construct Make/options
 #
 #     Usage : makeOptions
 #
@@ -35,8 +35,8 @@
 
 if [ -r Make/options ]
 then
-   echo "makeOptions: Make/options already exists, exiting"
-   exit 1
+    echo "Error: Make/options already exists - exiting"
+    exit 1
 fi
 
 [ -d Make ] || mkdir Make