From 0d445841128b1f73a1661171711fe3209f897b4d Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Thu, 22 Apr 2010 15:01:07 +0200
Subject: [PATCH] ENH: rationalize wmake rules to avoid unnecessary duplication
- main mplib rules located in GENERAL_RULES with specializations
(if any) under RULES. Modest change in a few options files, but
cleans up the rules directories.
previously in options:
include $(RULES)/mplib$(WM_MPLIB)
now in options:
sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
sinclude $(RULES)/mplib$(WM_MPLIB)
For GNU make it would be permissible to write both in a single line.
---
src/Pstream/gamma/Make/options | 5 +++--
src/Pstream/mpi/Make/options | 5 +++--
src/parallel/decompose/ptscotchDecomp/Make/options | 3 ++-
wmake/MakefileFiles | 2 +-
wmake/MakefileOptions | 2 +-
wmake/rules/General/standard | 2 ++
wmake/rules/SiCortex64Gcc/mplib | 1 -
wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/SunOS64Gcc/mplib | 1 -
wmake/rules/SunOS64Gcc/mplibOPENMPI | 1 -
wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linux64Gcc/X | 1 -
wmake/rules/linux64Gcc/general | 1 -
wmake/rules/linux64Gcc/mplib | 1 -
wmake/rules/linux64Gcc/mplibGAMMA | 1 -
wmake/rules/linux64Gcc/mplibMPICH | 1 -
wmake/rules/linux64Gcc/mplibMPICH-GM | 1 -
wmake/rules/linux64Gcc/mplibOPENMPI | 1 -
wmake/rules/linux64Gcc/mplibQSMPI | 1 -
wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linux64Gcc43/X | 1 -
wmake/rules/linux64Gcc43/general | 1 -
wmake/rules/linux64Gcc43/mplib | 1 -
wmake/rules/linux64Gcc43/mplibGAMMA | 1 -
wmake/rules/linux64Gcc43/mplibMPICH | 1 -
wmake/rules/linux64Gcc43/mplibMPICH-GM | 1 -
wmake/rules/linux64Gcc43/mplibOPENMPI | 1 -
wmake/rules/linux64Gcc43/mplibQSMPI | 1 -
wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linux64Gcc44/X | 1 -
wmake/rules/linux64Gcc44/general | 1 -
wmake/rules/linux64Gcc44/mplib | 1 -
wmake/rules/linux64Gcc44/mplibGAMMA | 1 -
wmake/rules/linux64Gcc44/mplibMPICH | 1 -
wmake/rules/linux64Gcc44/mplibMPICH-GM | 1 -
wmake/rules/linux64Gcc44/mplibOPENMPI | 1 -
wmake/rules/linux64Gcc44/mplibQSMPI | 1 -
wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linux64Gcc45/X | 1 -
wmake/rules/linux64Gcc45/general | 1 -
wmake/rules/linux64Gcc45/mplib | 1 -
wmake/rules/linux64Gcc45/mplibGAMMA | 1 -
wmake/rules/linux64Gcc45/mplibMPICH | 1 -
wmake/rules/linux64Gcc45/mplibMPICH-GM | 1 -
wmake/rules/linux64Gcc45/mplibOPENMPI | 1 -
wmake/rules/linux64Gcc45/mplibQSMPI | 1 -
wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linux64Icc/X | 1 -
wmake/rules/linux64Icc/general | 1 -
wmake/rules/linux64Icc/mplib | 1 -
wmake/rules/linux64Icc/mplibMPICH | 1 -
wmake/rules/linux64Icc/mplibOPENMPI | 1 -
wmake/rules/linux64Icc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxGcc/X | 1 -
wmake/rules/linuxGcc/general | 1 -
wmake/rules/linuxGcc/mplib | 1 -
wmake/rules/linuxGcc/mplibGAMMA | 1 -
wmake/rules/linuxGcc/mplibMPICH | 1 -
wmake/rules/linuxGcc/mplibMPICH-GM | 1 -
wmake/rules/linuxGcc/mplibOPENMPI | 1 -
wmake/rules/linuxGcc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxGcc43/X | 1 -
wmake/rules/linuxGcc43/general | 1 -
wmake/rules/linuxGcc43/mplib | 1 -
wmake/rules/linuxGcc43/mplibGAMMA | 1 -
wmake/rules/linuxGcc43/mplibMPICH | 1 -
wmake/rules/linuxGcc43/mplibMPICH-GM | 1 -
wmake/rules/linuxGcc43/mplibOPENMPI | 1 -
wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxGcc44/X | 1 -
wmake/rules/linuxGcc44/general | 1 -
wmake/rules/linuxGcc44/mplib | 1 -
wmake/rules/linuxGcc44/mplibGAMMA | 1 -
wmake/rules/linuxGcc44/mplibMPICH | 1 -
wmake/rules/linuxGcc44/mplibMPICH-GM | 1 -
wmake/rules/linuxGcc44/mplibOPENMPI | 1 -
wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxGcc45/X | 1 -
wmake/rules/linuxGcc45/general | 1 -
wmake/rules/linuxGcc45/mplib | 1 -
wmake/rules/linuxGcc45/mplibGAMMA | 1 -
wmake/rules/linuxGcc45/mplibMPICH | 1 -
wmake/rules/linuxGcc45/mplibMPICH-GM | 1 -
wmake/rules/linuxGcc45/mplibOPENMPI | 1 -
wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxIA64Gcc/mplib | 1 -
wmake/rules/linuxIA64Gcc/mplibMPICH | 1 -
wmake/rules/linuxIA64Gcc/mplibOPENMPI | 1 -
wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxIA64Icc/mplib | 1 -
wmake/rules/linuxIA64Icc/mplibMPICH | 1 -
wmake/rules/linuxIA64Icc/mplibOPENMPI | 1 -
wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxIcc/X | 1 -
wmake/rules/linuxIcc/general | 1 -
wmake/rules/linuxIcc/mplib | 1 -
wmake/rules/linuxIcc/mplibMPICH | 1 -
wmake/rules/linuxIcc/mplibOPENMPI | 1 -
wmake/rules/linuxIcc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxPPC64Gcc/mplib | 1 -
wmake/rules/linuxPPC64Gcc/mplibGAMMA | 1 -
wmake/rules/linuxPPC64Gcc/mplibMPICH | 1 -
wmake/rules/linuxPPC64Gcc/mplibMPICH-GM | 1 -
wmake/rules/linuxPPC64Gcc/mplibOPENMPI | 1 -
wmake/rules/linuxPPC64Gcc/mplibQSMPI | 1 -
wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI | 1 -
wmake/rules/linuxmingw32/mplib | 1 -
wmake/rules/linuxmingw32/mplibGAMMA | 1 -
wmake/rules/linuxmingw32/mplibMPICH | 1 -
wmake/rules/linuxmingw32/mplibMPICH-GM | 1 -
wmake/rules/linuxmingw32/mplibOPENMPI | 1 -
wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI | 1 -
wmake/rules/solarisGcc/mplib | 1 -
wmake/rules/solarisGcc/mplibOPENMPI | 1 -
wmake/rules/solarisGcc/mplibSYSTEMOPENMPI | 1 -
115 files changed, 12 insertions(+), 116 deletions(-)
delete mode 120000 wmake/rules/SiCortex64Gcc/mplib
delete mode 120000 wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/SunOS64Gcc/mplib
delete mode 120000 wmake/rules/SunOS64Gcc/mplibOPENMPI
delete mode 120000 wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linux64Gcc/X
delete mode 120000 wmake/rules/linux64Gcc/mplib
delete mode 120000 wmake/rules/linux64Gcc/mplibGAMMA
delete mode 120000 wmake/rules/linux64Gcc/mplibMPICH
delete mode 120000 wmake/rules/linux64Gcc/mplibMPICH-GM
delete mode 120000 wmake/rules/linux64Gcc/mplibOPENMPI
delete mode 120000 wmake/rules/linux64Gcc/mplibQSMPI
delete mode 120000 wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linux64Gcc43/X
delete mode 120000 wmake/rules/linux64Gcc43/mplib
delete mode 120000 wmake/rules/linux64Gcc43/mplibGAMMA
delete mode 120000 wmake/rules/linux64Gcc43/mplibMPICH
delete mode 120000 wmake/rules/linux64Gcc43/mplibMPICH-GM
delete mode 120000 wmake/rules/linux64Gcc43/mplibOPENMPI
delete mode 120000 wmake/rules/linux64Gcc43/mplibQSMPI
delete mode 120000 wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linux64Gcc44/X
delete mode 120000 wmake/rules/linux64Gcc44/mplib
delete mode 120000 wmake/rules/linux64Gcc44/mplibGAMMA
delete mode 120000 wmake/rules/linux64Gcc44/mplibMPICH
delete mode 120000 wmake/rules/linux64Gcc44/mplibMPICH-GM
delete mode 120000 wmake/rules/linux64Gcc44/mplibOPENMPI
delete mode 120000 wmake/rules/linux64Gcc44/mplibQSMPI
delete mode 120000 wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linux64Gcc45/X
delete mode 120000 wmake/rules/linux64Gcc45/mplib
delete mode 120000 wmake/rules/linux64Gcc45/mplibGAMMA
delete mode 120000 wmake/rules/linux64Gcc45/mplibMPICH
delete mode 120000 wmake/rules/linux64Gcc45/mplibMPICH-GM
delete mode 120000 wmake/rules/linux64Gcc45/mplibOPENMPI
delete mode 120000 wmake/rules/linux64Gcc45/mplibQSMPI
delete mode 120000 wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linux64Icc/X
delete mode 120000 wmake/rules/linux64Icc/mplib
delete mode 120000 wmake/rules/linux64Icc/mplibMPICH
delete mode 120000 wmake/rules/linux64Icc/mplibOPENMPI
delete mode 120000 wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxGcc/X
delete mode 120000 wmake/rules/linuxGcc/mplib
delete mode 120000 wmake/rules/linuxGcc/mplibGAMMA
delete mode 120000 wmake/rules/linuxGcc/mplibMPICH
delete mode 120000 wmake/rules/linuxGcc/mplibMPICH-GM
delete mode 120000 wmake/rules/linuxGcc/mplibOPENMPI
delete mode 120000 wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxGcc43/X
delete mode 120000 wmake/rules/linuxGcc43/mplib
delete mode 120000 wmake/rules/linuxGcc43/mplibGAMMA
delete mode 120000 wmake/rules/linuxGcc43/mplibMPICH
delete mode 120000 wmake/rules/linuxGcc43/mplibMPICH-GM
delete mode 120000 wmake/rules/linuxGcc43/mplibOPENMPI
delete mode 120000 wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxGcc44/X
delete mode 120000 wmake/rules/linuxGcc44/mplib
delete mode 120000 wmake/rules/linuxGcc44/mplibGAMMA
delete mode 120000 wmake/rules/linuxGcc44/mplibMPICH
delete mode 120000 wmake/rules/linuxGcc44/mplibMPICH-GM
delete mode 120000 wmake/rules/linuxGcc44/mplibOPENMPI
delete mode 120000 wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxGcc45/X
delete mode 120000 wmake/rules/linuxGcc45/mplib
delete mode 120000 wmake/rules/linuxGcc45/mplibGAMMA
delete mode 120000 wmake/rules/linuxGcc45/mplibMPICH
delete mode 120000 wmake/rules/linuxGcc45/mplibMPICH-GM
delete mode 120000 wmake/rules/linuxGcc45/mplibOPENMPI
delete mode 120000 wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxIA64Gcc/mplib
delete mode 120000 wmake/rules/linuxIA64Gcc/mplibMPICH
delete mode 120000 wmake/rules/linuxIA64Gcc/mplibOPENMPI
delete mode 120000 wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxIA64Icc/mplib
delete mode 120000 wmake/rules/linuxIA64Icc/mplibMPICH
delete mode 120000 wmake/rules/linuxIA64Icc/mplibOPENMPI
delete mode 120000 wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxIcc/X
delete mode 120000 wmake/rules/linuxIcc/mplib
delete mode 120000 wmake/rules/linuxIcc/mplibMPICH
delete mode 120000 wmake/rules/linuxIcc/mplibOPENMPI
delete mode 120000 wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxPPC64Gcc/mplib
delete mode 120000 wmake/rules/linuxPPC64Gcc/mplibGAMMA
delete mode 120000 wmake/rules/linuxPPC64Gcc/mplibMPICH
delete mode 120000 wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
delete mode 120000 wmake/rules/linuxPPC64Gcc/mplibOPENMPI
delete mode 120000 wmake/rules/linuxPPC64Gcc/mplibQSMPI
delete mode 120000 wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/linuxmingw32/mplib
delete mode 120000 wmake/rules/linuxmingw32/mplibGAMMA
delete mode 120000 wmake/rules/linuxmingw32/mplibMPICH
delete mode 120000 wmake/rules/linuxmingw32/mplibMPICH-GM
delete mode 120000 wmake/rules/linuxmingw32/mplibOPENMPI
delete mode 120000 wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
delete mode 120000 wmake/rules/solarisGcc/mplib
delete mode 120000 wmake/rules/solarisGcc/mplibOPENMPI
delete mode 120000 wmake/rules/solarisGcc/mplibSYSTEMOPENMPI
diff --git a/src/Pstream/gamma/Make/options b/src/Pstream/gamma/Make/options
index 90632e801ed..74b6659671d 100644
--- a/src/Pstream/gamma/Make/options
+++ b/src/Pstream/gamma/Make/options
@@ -1,4 +1,5 @@
-include $(RULES)/mplib$(WM_MPLIB)
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
-EXE_INC = $(PFLAGS) $(PINC)
+EXE_INC = $(PFLAGS) $(PINC)
LIB_LIBS = $(PLIBS)
diff --git a/src/Pstream/mpi/Make/options b/src/Pstream/mpi/Make/options
index 90632e801ed..74b6659671d 100644
--- a/src/Pstream/mpi/Make/options
+++ b/src/Pstream/mpi/Make/options
@@ -1,4 +1,5 @@
-include $(RULES)/mplib$(WM_MPLIB)
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
-EXE_INC = $(PFLAGS) $(PINC)
+EXE_INC = $(PFLAGS) $(PINC)
LIB_LIBS = $(PLIBS)
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index f8e8f924602..b2b76fce059 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -1,4 +1,5 @@
-include $(RULES)/mplib$(WM_MPLIB)
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
EXE_INC = \
$(PFLAGS) $(PINC) \
diff --git a/wmake/MakefileFiles b/wmake/MakefileFiles
index 59eabfe5a5c..7303329f691 100644
--- a/wmake/MakefileFiles
+++ b/wmake/MakefileFiles
@@ -58,7 +58,7 @@ IFILES = $(WM_OPTIONS)/includeDeps
allFiles : $(FILES) $(SFILES) $(OFILES) $(DFILES) $(IFILES)
$(FILES) : files
- @$(CPP) $(GFLAGS) $(FFLAGS) files > $(FILES)
+ @$(CPP) $(GFLAGS) $(FFLAGS) files | sed -e 's@ *@ @g' > $(FILES)
$(SFILES): files
@$(WM_SCRIPTS)/makeDerivedFiles
diff --git a/wmake/MakefileOptions b/wmake/MakefileOptions
index 0a31e6f69a6..45d33ffb719 100644
--- a/wmake/MakefileOptions
+++ b/wmake/MakefileOptions
@@ -48,7 +48,7 @@ OPTIONS = $(WM_OPTIONS)/options
#------------------------------------------------------------------------------
$(OPTIONS) : options
- @$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options > $(OPTIONS)
+ @$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options | sed -e 's@ *@ @g' > $(OPTIONS)
#------------------------------------------------------------------------------
diff --git a/wmake/rules/General/standard b/wmake/rules/General/standard
index 9b2cbd25275..76a60a31ce2 100644
--- a/wmake/rules/General/standard
+++ b/wmake/rules/General/standard
@@ -9,3 +9,5 @@ include $(GENERAL_RULES)/coco-cpp
## include $(GENERAL_RULES)/btyacc++
include $(GENERAL_RULES)/bison
include $(GENERAL_RULES)/moc
+
+include $(GENERAL_RULES)/X
diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/SiCortex64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/SunOS64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/SunOS64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linux64Gcc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 7285501d981..e7faa0c0f20 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -2,6 +2,5 @@ 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/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linux64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linux64Gcc/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linux64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI
deleted file mode 120000
index d3446c68f17..00000000000
--- a/wmake/rules/linux64Gcc/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linux64Gcc43/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general
index 7285501d981..e7faa0c0f20 100644
--- a/wmake/rules/linux64Gcc43/general
+++ b/wmake/rules/linux64Gcc43/general
@@ -2,6 +2,5 @@ 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/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linux64Gcc43/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linux64Gcc43/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linux64Gcc43/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linux64Gcc43/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linux64Gcc43/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI
deleted file mode 120000
index d3446c68f17..00000000000
--- a/wmake/rules/linux64Gcc43/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linux64Gcc44/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general
index 7285501d981..e7faa0c0f20 100644
--- a/wmake/rules/linux64Gcc44/general
+++ b/wmake/rules/linux64Gcc44/general
@@ -2,6 +2,5 @@ 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/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linux64Gcc44/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linux64Gcc44/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linux64Gcc44/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linux64Gcc44/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linux64Gcc44/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI
deleted file mode 120000
index d3446c68f17..00000000000
--- a/wmake/rules/linux64Gcc44/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/X b/wmake/rules/linux64Gcc45/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linux64Gcc45/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/general b/wmake/rules/linux64Gcc45/general
index bfe6574e818..f9bb2e6b1e5 100644
--- a/wmake/rules/linux64Gcc45/general
+++ b/wmake/rules/linux64Gcc45/general
@@ -5,6 +5,5 @@ 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/linux64Gcc45/mplib b/wmake/rules/linux64Gcc45/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linux64Gcc45/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibGAMMA b/wmake/rules/linux64Gcc45/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linux64Gcc45/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibMPICH b/wmake/rules/linux64Gcc45/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linux64Gcc45/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibMPICH-GM b/wmake/rules/linux64Gcc45/mplibMPICH-GM
deleted file mode 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linux64Gcc45/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibOPENMPI b/wmake/rules/linux64Gcc45/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linux64Gcc45/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibQSMPI b/wmake/rules/linux64Gcc45/mplibQSMPI
deleted file mode 120000
index d3446c68f17..00000000000
--- a/wmake/rules/linux64Gcc45/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linux64Icc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general
index 7285501d981..e7faa0c0f20 100644
--- a/wmake/rules/linux64Icc/general
+++ b/wmake/rules/linux64Icc/general
@@ -2,6 +2,5 @@ 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/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linux64Icc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linux64Icc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linux64Icc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI b/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linuxGcc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index c19ca193948..ce84842fee3 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -4,6 +4,5 @@ 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/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxGcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linuxGcc/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxGcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linuxGcc/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxGcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxGcc/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 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linuxGcc43/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general
index c19ca193948..ce84842fee3 100644
--- a/wmake/rules/linuxGcc43/general
+++ b/wmake/rules/linuxGcc43/general
@@ -4,6 +4,5 @@ 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/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxGcc43/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linuxGcc43/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxGcc43/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linuxGcc43/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxGcc43/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linuxGcc44/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general
index c19ca193948..ce84842fee3 100644
--- a/wmake/rules/linuxGcc44/general
+++ b/wmake/rules/linuxGcc44/general
@@ -4,6 +4,5 @@ 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/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxGcc44/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linuxGcc44/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxGcc44/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linuxGcc44/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxGcc44/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/X b/wmake/rules/linuxGcc45/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linuxGcc45/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/general b/wmake/rules/linuxGcc45/general
index 7e9226e7954..91c54db85d6 100644
--- a/wmake/rules/linuxGcc45/general
+++ b/wmake/rules/linuxGcc45/general
@@ -6,6 +6,5 @@ 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/linuxGcc45/mplib b/wmake/rules/linuxGcc45/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxGcc45/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibGAMMA b/wmake/rules/linuxGcc45/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linuxGcc45/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibMPICH b/wmake/rules/linuxGcc45/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxGcc45/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibMPICH-GM b/wmake/rules/linuxGcc45/mplibMPICH-GM
deleted file mode 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linuxGcc45/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibOPENMPI b/wmake/rules/linuxGcc45/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxGcc45/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxIA64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxIA64Gcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxIA64Icc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxIA64Icc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxIA64Icc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X
deleted file mode 120000
index 73572d6c04b..00000000000
--- a/wmake/rules/linuxIcc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general
index c19ca193948..ce84842fee3 100644
--- a/wmake/rules/linuxIcc/general
+++ b/wmake/rules/linuxIcc/general
@@ -4,6 +4,5 @@ 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/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxIcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxIcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxIcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxPPC64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI
deleted file mode 120000
index d3446c68f17..00000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/linuxmingw32/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA
deleted file mode 120000
index 4b41692bf62..00000000000
--- a/wmake/rules/linuxmingw32/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH
deleted file mode 120000
index c83eb564e1b..00000000000
--- a/wmake/rules/linuxmingw32/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../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 120000
index 621d0857d32..00000000000
--- a/wmake/rules/linuxmingw32/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/linuxmingw32/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI b/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib
deleted file mode 120000
index 1fa0d64ec89..00000000000
--- a/wmake/rules/solarisGcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6c..00000000000
--- a/wmake/rules/solarisGcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI b/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c36..00000000000
--- a/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
--
GitLab