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

-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)

src/Pstream/mpi/Make/options

-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)

src/parallel/decompose/ptscotchDecomp/Make/options

-include $(RULES)/mplib$(WM_MPLIB)
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \

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

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)
 
 
 #------------------------------------------------------------------------------

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

wmake/rules/SiCortex64Gcc/mplib

-../General/mplib
\ No newline at end of file

wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI

-../General/mplibSYSTEMOPENMPI
\ No newline at end of file

wmake/rules/SunOS64Gcc/mplib

-../General/mplib
\ No newline at end of file

wmake/rules/SunOS64Gcc/mplibOPENMPI

-../General/mplibOPENMPI
\ No newline at end of file

wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI

-../General/mplibSYSTEMOPENMPI
\ No newline at end of file

wmake/rules/linux64Gcc/X

-../General/X
\ No newline at end of file

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++

wmake/rules/linux64Gcc/mplib

-../General/mplib
\ No newline at end of file

wmake/rules/linux64Gcc/mplibGAMMA

-../General/mplibGAMMA
\ No newline at end of file

wmake/rules/linux64Gcc/mplibMPICH

-../General/mplibMPICH
\ No newline at end of file

wmake/rules/linux64Gcc/mplibMPICH-GM

-../General/mplibMPICH-GM
\ No newline at end of file

wmake/rules/linux64Gcc/mplibOPENMPI

-../General/mplibOPENMPI
\ No newline at end of file

wmake/rules/linux64Gcc/mplibQSMPI

-../General/mplibQSMPI
\ No newline at end of file

wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI

-../General/mplibSYSTEMOPENMPI
\ No newline at end of file