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.
2010-04-22 15:01:07 +02:00 · 2010-04-22 15:01:07 +02:00 · 0d44584112
commit 0d44584112
parent 4d2a297a67
115 changed files with 12 additions and 116 deletions
--- 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)
--- 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)
--- 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) \
--- 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
--- 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)


 #------------------------------------------------------------------------------
--- 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
--- a/wmake/rules/SiCortex64Gcc/mplib
+++ b/wmake/rules/SiCortex64Gcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/SunOS64Gcc/mplib
+++ b/wmake/rules/SunOS64Gcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/SunOS64Gcc/mplibOPENMPI
+++ b/wmake/rules/SunOS64Gcc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linux64Gcc/X
+++ b/wmake/rules/linux64Gcc/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linux64Gcc/mplib
+++ b/wmake/rules/linux64Gcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ b/wmake/rules/linux64Gcc/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ b/wmake/rules/linux64Gcc/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linux64Gcc/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linux64Gcc/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linux64Gcc/mplibQSMPI
+++ b/wmake/rules/linux64Gcc/mplibQSMPI
@ -1 +0,0 @@
-../General/mplibQSMPI
--- a/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linux64Gcc43/X
+++ b/wmake/rules/linux64Gcc43/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linux64Gcc43/mplib
+++ b/wmake/rules/linux64Gcc43/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linux64Gcc43/mplibGAMMA
+++ b/wmake/rules/linux64Gcc43/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linux64Gcc43/mplibMPICH
+++ b/wmake/rules/linux64Gcc43/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linux64Gcc43/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc43/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linux64Gcc43/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc43/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linux64Gcc43/mplibQSMPI
+++ b/wmake/rules/linux64Gcc43/mplibQSMPI
@ -1 +0,0 @@
-../General/mplibQSMPI
--- a/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linux64Gcc44/X
+++ b/wmake/rules/linux64Gcc44/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linux64Gcc44/mplib
+++ b/wmake/rules/linux64Gcc44/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linux64Gcc44/mplibGAMMA
+++ b/wmake/rules/linux64Gcc44/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linux64Gcc44/mplibMPICH
+++ b/wmake/rules/linux64Gcc44/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linux64Gcc44/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc44/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linux64Gcc44/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc44/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linux64Gcc44/mplibQSMPI
+++ b/wmake/rules/linux64Gcc44/mplibQSMPI
@ -1 +0,0 @@
-../General/mplibQSMPI
--- a/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linux64Gcc45/X
+++ b/wmake/rules/linux64Gcc45/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linux64Gcc45/mplib
+++ b/wmake/rules/linux64Gcc45/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linux64Gcc45/mplibGAMMA
+++ b/wmake/rules/linux64Gcc45/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linux64Gcc45/mplibMPICH
+++ b/wmake/rules/linux64Gcc45/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linux64Gcc45/mplibMPICH-GM
+++ b/wmake/rules/linux64Gcc45/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linux64Gcc45/mplibOPENMPI
+++ b/wmake/rules/linux64Gcc45/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linux64Gcc45/mplibQSMPI
+++ b/wmake/rules/linux64Gcc45/mplibQSMPI
@ -1 +0,0 @@
-../General/mplibQSMPI
--- a/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linux64Icc/X
+++ b/wmake/rules/linux64Icc/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linux64Icc/mplib
+++ b/wmake/rules/linux64Icc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linux64Icc/mplibMPICH
+++ b/wmake/rules/linux64Icc/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linux64Icc/mplibOPENMPI
+++ b/wmake/rules/linux64Icc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxGcc/X
+++ b/wmake/rules/linuxGcc/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linuxGcc/mplib
+++ b/wmake/rules/linuxGcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linuxGcc/mplibGAMMA
+++ b/wmake/rules/linuxGcc/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linuxGcc/mplibMPICH
+++ b/wmake/rules/linuxGcc/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linuxGcc/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linuxGcc/mplibOPENMPI
+++ b/wmake/rules/linuxGcc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxGcc43/X
+++ b/wmake/rules/linuxGcc43/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linuxGcc43/mplib
+++ b/wmake/rules/linuxGcc43/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linuxGcc43/mplibGAMMA
+++ b/wmake/rules/linuxGcc43/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linuxGcc43/mplibMPICH
+++ b/wmake/rules/linuxGcc43/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linuxGcc43/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc43/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linuxGcc43/mplibOPENMPI
+++ b/wmake/rules/linuxGcc43/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxGcc44/X
+++ b/wmake/rules/linuxGcc44/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linuxGcc44/mplib
+++ b/wmake/rules/linuxGcc44/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linuxGcc44/mplibGAMMA
+++ b/wmake/rules/linuxGcc44/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linuxGcc44/mplibMPICH
+++ b/wmake/rules/linuxGcc44/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linuxGcc44/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc44/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linuxGcc44/mplibOPENMPI
+++ b/wmake/rules/linuxGcc44/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxGcc45/X
+++ b/wmake/rules/linuxGcc45/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linuxGcc45/mplib
+++ b/wmake/rules/linuxGcc45/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linuxGcc45/mplibGAMMA
+++ b/wmake/rules/linuxGcc45/mplibGAMMA
@ -1 +0,0 @@
-../General/mplibGAMMA
--- a/wmake/rules/linuxGcc45/mplibMPICH
+++ b/wmake/rules/linuxGcc45/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linuxGcc45/mplibMPICH-GM
+++ b/wmake/rules/linuxGcc45/mplibMPICH-GM
@ -1 +0,0 @@
-../General/mplibMPICH-GM
--- a/wmake/rules/linuxGcc45/mplibOPENMPI
+++ b/wmake/rules/linuxGcc45/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxIA64Gcc/mplib
+++ b/wmake/rules/linuxIA64Gcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linuxIA64Gcc/mplibMPICH
+++ b/wmake/rules/linuxIA64Gcc/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxIA64Icc/mplib
+++ b/wmake/rules/linuxIA64Icc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linuxIA64Icc/mplibMPICH
+++ b/wmake/rules/linuxIA64Icc/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linuxIA64Icc/mplibOPENMPI
+++ b/wmake/rules/linuxIA64Icc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxIcc/X
+++ b/wmake/rules/linuxIcc/X
@ -1 +0,0 @@
-../General/X
--- 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++
--- a/wmake/rules/linuxIcc/mplib
+++ b/wmake/rules/linuxIcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/wmake/rules/linuxIcc/mplibMPICH
+++ b/wmake/rules/linuxIcc/mplibMPICH
@ -1 +0,0 @@
-../General/mplibMPICH
--- a/wmake/rules/linuxIcc/mplibOPENMPI
+++ b/wmake/rules/linuxIcc/mplibOPENMPI
@ -1 +0,0 @@
-../General/mplibOPENMPI
--- a/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
+++ b/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
--- a/wmake/rules/linuxPPC64Gcc/mplib
+++ b/wmake/rules/linuxPPC64Gcc/mplib
@ -1 +0,0 @@
-../General/mplib
--- a/Show More
+++ b/Show More