diff --git a/src/Allwmake b/src/Allwmake
index c2815e58c8b011285907c2533e6a06b82f37352b..00bbf8e5e6e91459e1c6913012629a2963c7247a 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 
 wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
     echo "Error: Current directory is not \$WM_PROJECT_DIR/src"
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index 7a2f2cd308aa275cf67e67a22cd2a400259c19e3..742d3d4478eaf475cf4d7f7174a8a5cb8041a8e3 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption dummy
 
 case "$WM_MPLIB" in
@@ -12,6 +10,7 @@ case "$WM_MPLIB" in
     set +x
     echo
     echo "Note: ignore spurious warnings about missing mpicxx.h headers"
+    echo
     set -x
     # force compilation into qualified directory
     WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB  wmake $makeOption mpi
diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake
index cf1e61d47d05584465858dc494c71a97c4a3be20..444d3f654914f34ac8b85f9fb9ab7494dc57437a 100755
--- a/src/conversion/Allwmake
+++ b/src/conversion/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake
index afd49cd5d9db41c233d85b5e2f4b903ba4c56bde..5076d8d2b72e19cf8ef9d71a6962fc0a75db8cd0 100755
--- a/src/dummyThirdParty/Allwmake
+++ b/src/dummyThirdParty/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption scotchDecomp
 wmake $makeOption ptscotchDecomp
 wmake $makeOption metisDecomp
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index 27f2fea53aef043f14cf3a6dd7b7363cbfd9499f..fcccbcbe9aac79c069fec77b1c5d3339d2a4a72e 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption MGridGenGamgAgglomeration
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index 26fd814f633d4e1da9b484a5f0d38535cb57f805..e04d7480fbfa02bfd0c352b63c2a138a6ea337ee 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption basic
 wmake $makeOption solidParticle
 wmake $makeOption intermediate
diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake
index 131ec5d458ef870b55484ecd58147220f597189a..60b24dea4dd310a0ef7cadcd5e23655dc5897234 100755
--- a/src/lagrangian/molecularDynamics/Allwmake
+++ b/src/lagrangian/molecularDynamics/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption potential
 wmake $makeOption molecularMeasurements
 wmake $makeOption molecule
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index 57df2d57bf013b28e2c1040ff1d1d0cc87f0e34c..f980e0e73fa960191080511b80ab2d7571c5bafc 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption autoMesh
 wmake $makeOption blockMesh
 
diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake
index 92d80e20a8ca4e0941b55cff79f514da8ae3dbd7..d3600e13b1992a63eef07282165b8f7cbe778170 100755
--- a/src/parallel/Allwmake
+++ b/src/parallel/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 decompose/Allwmake $*
 reconstruct/Allwmake $*
 wmake $makeOption distributed
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 93835f6a244878bbb3c31a65264c9f25bf0399f6..3848e66478cae3ba36776daf1a247ce390b1c3cc 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -1,8 +1,6 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
-
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
 settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake
index 453d88f50b355df4aca3c151fa808defccc1ee8f..3d651d5a0033915818890a2779600473d095c330 100755
--- a/src/parallel/reconstruct/Allwmake
+++ b/src/parallel/reconstruct/Allwmake
@@ -1,11 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption reconstruct
 
-
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake
index d543c26fe1c6883fc011fd4bc540ca3053b19032..5a1caf16606eebdd3108560d15698654b66616ff 100755
--- a/src/postProcessing/Allwmake
+++ b/src/postProcessing/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake libo postCalc
 wmake $makeOption foamCalcFunctions
 
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index 14bdd330e1e8060621cb43182acfd67fefb79f47..9ae9bd3dca12085fc47258507e4c6189b43eb81e 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption field
 wmake $makeOption forces
 wmake $makeOption IO
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index e622e3c15b65e6c245149934d806f86813ae406a..0695c1fba4e51b696f6cb5a0660daa334f2f38cb 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption specie
 wmake $makeOption solid
 wmake $makeOption thermophysicalFunctions
diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake
index 703920418da6924072095e237d64793d8c64401e..f0eba94263ea1be6267d34f1dc7781621c5466e9 100755
--- a/src/transportModels/Allwmake
+++ b/src/transportModels/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption incompressible
 wmake $makeOption interfaceProperties
 wmake $makeOption twoPhaseInterfaceProperties
diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake
index 107251b4221630bc1ff43cba97bf08dabd3950f0..d24309692e25aa1d0b6b6489dfc5d1bd8c18608f 100755
--- a/src/turbulenceModels/LES/Allwmake
+++ b/src/turbulenceModels/LES/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmakeLnInclude ../incompressible/LES
 
 wmake $makeOption LESfilters
diff --git a/src/turbulenceModels/compressible/Allwmake b/src/turbulenceModels/compressible/Allwmake
index a16b5f9c81fb05c199c7640d60fd779896e6516b..60605f926d6781f193ed657f261c8a3f7838a271 100755
--- a/src/turbulenceModels/compressible/Allwmake
+++ b/src/turbulenceModels/compressible/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption turbulenceModel
 wmake $makeOption RAS
 wmake $makeOption LES
diff --git a/src/turbulenceModels/incompressible/Allwmake b/src/turbulenceModels/incompressible/Allwmake
index a16b5f9c81fb05c199c7640d60fd779896e6516b..60605f926d6781f193ed657f261c8a3f7838a271 100755
--- a/src/turbulenceModels/incompressible/Allwmake
+++ b/src/turbulenceModels/incompressible/Allwmake
@@ -1,10 +1,8 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
+[ $# -ge 1 ] && makeOption=$1 || makeOption=libso
 set -x
 
-makeOption=libso
-[ $# -ge 1 ] && makeOption=$1
-
 wmake $makeOption turbulenceModel
 wmake $makeOption RAS
 wmake $makeOption LES