diff --git a/src/Allwmake b/src/Allwmake
index f3c4420474f56a0740a88658e236f11e72325074..4dbc726a213d973a9af154955f0f29280a574d84 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
 wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
     echo "Error: Current directory is not \$WM_PROJECT_DIR/src"
     echo "    The environment variables are inconsistent with the installation."
@@ -21,53 +24,53 @@ wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/$WM_OPTIONS/global.? 2>/dev/n
 
 wmakeLnInclude OpenFOAM
 wmakeLnInclude OSspecific/$WM_OSTYPE
-Pstream/Allwmake
+Pstream/Allwmake $*
 
 OSspecific/$WM_OSTYPE/Allwmake
-wmake libso OpenFOAM
+wmake $makeOption OpenFOAM
 
-wmake libso fileFormats
-wmake libso triSurface
-wmake libso meshTools
-wmake libso edgeMesh
-wmake libso surfMesh
+wmake $makeOption fileFormats
+wmake $makeOption triSurface
+wmake $makeOption meshTools
+wmake $makeOption edgeMesh
+wmake $makeOption surfMesh
 
 # Decomposition methods needed by dummyThirdParty
 parallel/decompose/AllwmakeLnInclude
 # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
-dummyThirdParty/Allwmake
+dummyThirdParty/Allwmake $*
 
-wmake libso lagrangian/basic
-wmake libso finiteVolume
-wmake libso genericPatchFields
+wmake $makeOption lagrangian/basic
+wmake $makeOption finiteVolume
+wmake $makeOption genericPatchFields
 
 # Build the proper scotchDecomp, metisDecomp etc.
-parallel/Allwmake
+parallel/Allwmake $*
 
-wmake libso conversion
+wmake $makeOption conversion
 
-wmake libso sampling
+wmake $makeOption sampling
 
-wmake libso dynamicMesh
-wmake libso dynamicFvMesh
-wmake libso topoChangerFvMesh
+wmake $makeOption dynamicMesh
+wmake $makeOption dynamicFvMesh
+wmake $makeOption topoChangerFvMesh
 
-wmake libso ODE
-wmake libso randomProcesses
+wmake $makeOption ODE
+wmake $makeOption randomProcesses
 
-thermophysicalModels/Allwmake
-transportModels/Allwmake
-turbulenceModels/Allwmake
-wmake libso surfaceFilmModels
-lagrangian/Allwmake
-postProcessing/Allwmake
-mesh/Allwmake
+thermophysicalModels/Allwmake $*
+transportModels/Allwmake $*
+turbulenceModels/Allwmake $*
+wmake $makeOption surfaceFilmModels
+lagrangian/Allwmake $*
+postProcessing/Allwmake $*
+mesh/Allwmake $*
 
-wmake libso errorEstimation
+wmake $makeOption errorEstimation
 
-fvAgglomerationMethods/Allwmake
+fvAgglomerationMethods/Allwmake $*
 
-wmake libso fvMotionSolver
-wmake libso engine
+wmake $makeOption fvMotionSolver
+wmake $makeOption engine
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index ec3b07a8596ba2a9856acdb769a4032b537da088..7a2f2cd308aa275cf67e67a22cd2a400259c19e3 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -18,7 +18,7 @@ case "$WM_MPLIB" in
     ;;
 
 #GAMMA)
-#    wmake libso gamma
+#    wmake $makeOption gamma
 #    ;;
 esac
 
diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake
index a7168eeab1ac3959b97ef420010bdb59d397590d..cf1e61d47d05584465858dc494c71a97c4a3be20 100755
--- a/src/conversion/Allwmake
+++ b/src/conversion/Allwmake
@@ -2,6 +2,9 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake
index c584d921945dde3e54ecdb2c986eb2e738b43e5c..afd49cd5d9db41c233d85b5e2f4b903ba4c56bde 100755
--- a/src/dummyThirdParty/Allwmake
+++ b/src/dummyThirdParty/Allwmake
@@ -2,10 +2,13 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso scotchDecomp
-wmake libso ptscotchDecomp
-wmake libso metisDecomp
-wmake libso MGridGen
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption scotchDecomp
+wmake $makeOption ptscotchDecomp
+wmake $makeOption metisDecomp
+wmake $makeOption MGridGen
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index 17118db81821c912197722af3720c7bba6498ddd..27f2fea53aef043f14cf3a6dd7b7363cbfd9499f 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -2,6 +2,9 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso MGridGenGamgAgglomeration
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption MGridGenGamgAgglomeration
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index 92993c516ff3740ae22dd506cb43316d2f77ef19..26fd814f633d4e1da9b484a5f0d38535cb57f805 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -2,13 +2,16 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso basic
-wmake libso solidParticle
-wmake libso intermediate
-wmake libso dieselSpray
-wmake libso dsmc
-wmake libso coalCombustion
-
-molecularDynamics/Allwmake
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption basic
+wmake $makeOption solidParticle
+wmake $makeOption intermediate
+wmake $makeOption dieselSpray
+wmake $makeOption dsmc
+wmake $makeOption coalCombustion
+
+molecularDynamics/Allwmake $*
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake
index 3f5d397e722328b0534d20977000b334228acd94..131ec5d458ef870b55484ecd58147220f597189a 100755
--- a/src/lagrangian/molecularDynamics/Allwmake
+++ b/src/lagrangian/molecularDynamics/Allwmake
@@ -2,8 +2,11 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso potential
-wmake libso molecularMeasurements
-wmake libso molecule
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption potential
+wmake $makeOption molecularMeasurements
+wmake $makeOption molecule
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index f967335db3b92e201cc3f17fbc5053023da017c1..57df2d57bf013b28e2c1040ff1d1d0cc87f0e34c 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/Allwmake
@@ -2,7 +2,10 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso autoMesh
-wmake libso blockMesh
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption autoMesh
+wmake $makeOption blockMesh
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake
index 08ca4923f2dd42264233666e99987191bd57795f..92d80e20a8ca4e0941b55cff79f514da8ae3dbd7 100755
--- a/src/parallel/Allwmake
+++ b/src/parallel/Allwmake
@@ -2,9 +2,12 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-decompose/Allwmake
-reconstruct/Allwmake
-wmake libso distributed
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+decompose/Allwmake $*
+reconstruct/Allwmake $*
+wmake $makeOption distributed
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 51c23325cc5892c177d8a8c33591a83f423ab0ce..93835f6a244878bbb3c31a65264c9f25bf0399f6 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -1,6 +1,9 @@
 #!/bin/sh
 cd ${0%/*} || exit 1    # run from this directory
 
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
 settings=`$WM_PROJECT_DIR/bin/foamEtcFile apps/scotch/bashrc`
 if [ -f "$settings" ]
@@ -16,17 +19,17 @@ set -x
 
 wmakeLnInclude decompositionMethods
 
-wmake libso scotchDecomp
+wmake $makeOption scotchDecomp
 
 if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
 then
 (
     WM_OPTIONS=${WM_OPTIONS}$WM_MPLIB
-    wmake libso ptscotchDecomp
+    wmake $makeOption ptscotchDecomp
 )
 fi
 
-wmake libso decompositionMethods
+wmake $makeOption decompositionMethods
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake
index c4badc50674ba3b96bf6e7471f8a17a1e3febf0c..453d88f50b355df4aca3c151fa808defccc1ee8f 100755
--- a/src/parallel/reconstruct/Allwmake
+++ b/src/parallel/reconstruct/Allwmake
@@ -2,7 +2,10 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso reconstruct
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption reconstruct
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/Allwmake b/src/postProcessing/Allwmake
index 169c9c833fc09068cdd05989c6cd1119fd909c90..d543c26fe1c6883fc011fd4bc540ca3053b19032 100755
--- a/src/postProcessing/Allwmake
+++ b/src/postProcessing/Allwmake
@@ -2,9 +2,12 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
 wmake libo postCalc
-wmake libso foamCalcFunctions
+wmake $makeOption foamCalcFunctions
 
-functionObjects/Allwmake
+functionObjects/Allwmake $*
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/postProcessing/functionObjects/Allwmake b/src/postProcessing/functionObjects/Allwmake
index d8cbe09eb9ef47957d37281e867d764d5d035e10..14bdd330e1e8060621cb43182acfd67fefb79f47 100755
--- a/src/postProcessing/functionObjects/Allwmake
+++ b/src/postProcessing/functionObjects/Allwmake
@@ -2,11 +2,14 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso field
-wmake libso forces
-wmake libso IO
-wmake libso utilities
-wmake libso jobControl
-wmake libso systemCall
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption field
+wmake $makeOption forces
+wmake $makeOption IO
+wmake $makeOption utilities
+wmake $makeOption jobControl
+wmake $makeOption systemCall
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 7b1b586b563a2dc06a69717456e86b29d69a22fc..e622e3c15b65e6c245149934d806f86813ae406a 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -2,27 +2,30 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso specie
-wmake libso solid
-wmake libso thermophysicalFunctions
-wmake libso liquids
-wmake libso liquidMixture
-wmake libso pointSolids
-wmake libso pointSolidMixture
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
 
-wmake libso basic
-wmake libso reactionThermo
-wmake libso laminarFlameSpeed
-wmake libso chemistryModel
-wmake libso pdfs
-wmake libso radiation
-wmake libso barotropicCompressibilityModel
-wmake libso thermalPorousZone
+wmake $makeOption specie
+wmake $makeOption solid
+wmake $makeOption thermophysicalFunctions
+wmake $makeOption liquids
+wmake $makeOption liquidMixture
+wmake $makeOption pointSolids
+wmake $makeOption pointSolidMixture
 
-wmake libso SLGThermo
+wmake $makeOption basic
+wmake $makeOption reactionThermo
+wmake $makeOption laminarFlameSpeed
+wmake $makeOption chemistryModel
+wmake $makeOption pdfs
+wmake $makeOption radiation
+wmake $makeOption barotropicCompressibilityModel
+wmake $makeOption thermalPorousZone
+
+wmake $makeOption SLGThermo
 
 # Should be combined with solids&solidMixture
-wmake libso basicSolidThermo
+wmake $makeOption basicSolidThermo
 
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake
index 138f265357ee6d27655f1140e247ccb3f7c7b5d1..703920418da6924072095e237d64793d8c64401e 100755
--- a/src/transportModels/Allwmake
+++ b/src/transportModels/Allwmake
@@ -2,9 +2,12 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso incompressible
-wmake libso interfaceProperties
-wmake libso twoPhaseInterfaceProperties
-# wmake libso compressible
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption incompressible
+wmake $makeOption interfaceProperties
+wmake $makeOption twoPhaseInterfaceProperties
+# wmake $makeOption compressible
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/Allwmake b/src/turbulenceModels/Allwmake
index 80dc9dc1ee0053a356519db504dcc8514e6a86a5..e78f0c30dd59f9f2711d25386d9d338fcac2485c 100755
--- a/src/turbulenceModels/Allwmake
+++ b/src/turbulenceModels/Allwmake
@@ -2,8 +2,8 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-LES/Allwmake
-incompressible/Allwmake
-compressible/Allwmake
+LES/Allwmake $*
+incompressible/Allwmake $*
+compressible/Allwmake $*
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake
index 00f3bf3adaa119ab2761a77aeb7b81e710795308..107251b4221630bc1ff43cba97bf08dabd3950f0 100755
--- a/src/turbulenceModels/LES/Allwmake
+++ b/src/turbulenceModels/LES/Allwmake
@@ -2,9 +2,12 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
 wmakeLnInclude ../incompressible/LES
 
-wmake libso LESfilters
-wmake libso LESdeltas
+wmake $makeOption LESfilters
+wmake $makeOption LESdeltas
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/compressible/Allwmake b/src/turbulenceModels/compressible/Allwmake
index ddff4170182e9c3f52fe2291bbebe0b912eca766..a16b5f9c81fb05c199c7640d60fd779896e6516b 100755
--- a/src/turbulenceModels/compressible/Allwmake
+++ b/src/turbulenceModels/compressible/Allwmake
@@ -2,8 +2,11 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso turbulenceModel
-wmake libso RAS
-wmake libso LES
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption turbulenceModel
+wmake $makeOption RAS
+wmake $makeOption LES
 
 # ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/incompressible/Allwmake b/src/turbulenceModels/incompressible/Allwmake
index ddff4170182e9c3f52fe2291bbebe0b912eca766..a16b5f9c81fb05c199c7640d60fd779896e6516b 100755
--- a/src/turbulenceModels/incompressible/Allwmake
+++ b/src/turbulenceModels/incompressible/Allwmake
@@ -2,8 +2,11 @@
 cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-wmake libso turbulenceModel
-wmake libso RAS
-wmake libso LES
+makeOption=libso
+[ $# -ge 1 ] && makeOption=$1
+
+wmake $makeOption turbulenceModel
+wmake $makeOption RAS
+wmake $makeOption LES
 
 # ----------------------------------------------------------------- end-of-file