New version of wmake supporting out-of-tree object and dependency files

src/Allwmake

@@ -1,86 +1,83 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmakeCheckPwd "$WM_PROJECT_DIR/src" || {
-    echo "Error: Current directory is not \$WM_PROJECT_DIR/src"
+    echo "Allwmake error: Current directory is not \$WM_PROJECT_DIR/src"
     echo "    The environment variables are inconsistent with the installation."
     echo "    Check the OpenFOAM entries in your dot-files and source them."
     exit 1
 }
 
 [ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error: FOAM_EXT_LIBBIN not set"
+    echo "Allwmake error: FOAM_EXT_LIBBIN not set"
     echo "    Check the OpenFOAM entries in your dot-files and source them."
     exit 1
 }
 
 set -x
 
-# update OpenFOAM version strings if required
+# Update OpenFOAM version strings if required
 wmakePrintBuild -check || /bin/rm -f OpenFOAM/Make/*/global.? 2>/dev/null
 
 wmakeLnInclude OpenFOAM
 wmakeLnInclude OSspecific/${WM_OSTYPE:-POSIX}
-Pstream/Allwmake $*
+Pstream/Allwmake $targetType $*
 
 OSspecific/${WM_OSTYPE:-POSIX}/Allwmake $*
-wmake $makeType OpenFOAM
+wmake $targetType OpenFOAM
 
-wmake $makeType fileFormats
-wmake $makeType surfMesh
-wmake $makeType triSurface
-wmake $makeType meshTools
-wmake $makeType edgeMesh
+wmake $targetType fileFormats
+wmake $targetType surfMesh
+wmake $targetType triSurface
+wmake $targetType meshTools
+wmake $targetType edgeMesh
 
 # Decomposition methods needed by dummyThirdParty
+# (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
 parallel/decompose/AllwmakeLnInclude
-# dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
-dummyThirdParty/Allwmake $*
+dummyThirdParty/Allwmake $targetType $*
 
-wmake $makeType finiteVolume
-wmake $makeType lagrangian/basic
-wmake $makeType lagrangian/distributionModels
-wmake $makeType genericPatchFields
+wmake $targetType finiteVolume
+wmake $targetType lagrangian/basic
+wmake $targetType lagrangian/distributionModels
+wmake $targetType genericPatchFields
 
-# Build the proper scotchDecomp, metisDecomp etc.
-parallel/Allwmake $*
+wmake $targetType conversion
+wmake $targetType sampling
+wmake $targetType mesh/extrudeModel
+wmake $targetType dynamicMesh
+wmake $targetType dynamicFvMesh
+wmake $targetType topoChangerFvMesh
 
-renumber/Allwmake $*
+# Compile scotchDecomp, metisDecomp etc.
+parallel/Allwmake $targetType $*
 
-wmake $makeType conversion
+wmake $targetType ODE
+wmake $targetType randomProcesses
 
-wmake $makeType sampling
+transportModels/Allwmake $targetType $*
+thermophysicalModels/Allwmake $targetType $*
+turbulenceModels/Allwmake $targetType $*
+TurbulenceModels/Allwmake $targetType $*
+wmake $targetType combustionModels
+regionModels/Allwmake $targetType $*
+lagrangian/Allwmake $targetType $*
+mesh/Allwmake $targetType $*
+renumber/Allwmake $targetType $*
+fvAgglomerationMethods/Allwmake $targetType $*
 
-wmake $makeType mesh/extrudeModel
+wmake $targetType fvMotionSolver
+wmake $targetType engine
+wmake $targetType fvOptions
+wmake $targetType regionCoupled
 
-wmake $makeType dynamicMesh
-wmake $makeType dynamicFvMesh
-wmake $makeType topoChangerFvMesh
+postProcessing/Allwmake $targetType $*
 
-wmake $makeType ODE
-wmake $makeType randomProcesses
+wmake $targetType sixDoFRigidBodyMotion
 
-thermophysicalModels/Allwmake $*
-transportModels/Allwmake $*
-turbulenceModels/Allwmake $*
-TurbulenceModels/Allwmake $*
-wmake $makeType combustionModels
-regionModels/Allwmake $*
-lagrangian/Allwmake $*
-mesh/Allwmake $*
-
-fvAgglomerationMethods/Allwmake $*
-
-wmake $makeType fvMotionSolver
-wmake $makeType engine
-
-wmake $makeType fvOptions
-
-wmake $makeType regionCoupled
-
-postProcessing/Allwmake $*
-
-wmake $makeType sixDoFRigidBodyMotion
 
 # ----------------------------------------------------------------- end-of-file

src/OSspecific/POSIX/Allwmake

@@ -1,16 +1,16 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libo}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libo
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments $*
 
 unset COMP_FLAGS LINK_FLAGS
 
 #
 # use <sys/inotify.h> if available (Linux)
-# unless otherwise specified (with USE_STAT)
 #
-# eg,  ./Allwmake USE_STAT
-#
-if [ -f /usr/include/sys/inotify.h -a "${1%USE_STAT}" = "$1" ]
+if [ -f /usr/include/sys/inotify.h ]
 then
     echo "Found <sys/inotify.h>  --  enabling inotify for file monitoring."
     export COMP_FLAGS="-DFOAM_USE_INOTIFY"
@@ -18,8 +18,7 @@ else
     unset COMP_FLAGS
 fi
 
-
-# make (non-shared) object
-wmake $makeType 
+# make (non-shared by default) object
+wmake $targetType
 
 # ----------------------------------------------------------------- end-of-file

src/Pstream/Allwmake

@@ -1,10 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 
 #
-# define how to create an mpi-versioned library of $makeType
+# define how to create an mpi-versioned library of $targetType
 # compile into qualified directory
 # use sentinel file to handle version changes
 #
@@ -15,10 +18,10 @@ wmakeMpiLib()
     do
     (
         WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
-        whichmpi="$libName/Make/$WM_OPTIONS/using:$FOAM_MPI"
+        whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/Pstream/$libName/using:$FOAM_MPI"
         [ -e "$whichmpi" ] || wclean $libName
-        echo "wmake $makeType $libName"
-        wmake $makeType $libName
+        echo "wmake $targetType $libName"
+        wmake $targetType $libName
         touch "$whichmpi"
     )
     done
@@ -26,7 +29,7 @@ wmakeMpiLib()
 }
 
 set -x
-wmake $makeType dummy
+wmake $targetType dummy
 
 case "$WM_MPLIB" in
 *MPI*)
@@ -36,10 +39,6 @@ case "$WM_MPLIB" in
     echo
     wmakeMpiLib mpi
     ;;
-
-#GAMMA)
-#    wmake $makeType gamma
-#    ;;
 esac
 
 

src/TurbulenceModels/Allwmake

@@ -1,11 +1,14 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType turbulenceModels
-wmake $makeType incompressible
-wmake $makeType compressible
+wmake $targetType turbulenceModels
+wmake $targetType incompressible
+wmake $targetType compressible
 wmakeLnInclude phaseIncompressible
 wmakeLnInclude phaseCompressible
 

src/conversion/Allwmake

@@ -1,8 +1,11 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType
+wmake $targetType
 
 # ----------------------------------------------------------------- end-of-file

src/dummyThirdParty/Allwmake

@@ -1,12 +1,15 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType scotchDecomp
-wmake $makeType ptscotchDecomp
-wmake $makeType metisDecomp
-wmake $makeType MGridGen
+wmake $targetType scotchDecomp
+wmake $targetType ptscotchDecomp
+wmake $targetType metisDecomp
+wmake $targetType MGridGen
 
 
 # ----------------------------------------------------------------- end-of-file

src/fvAgglomerationMethods/Allwmake

@@ -1,33 +1,36 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
 
 if [ -e "$FOAM_LIBBIN/libMGridGen.so" ]
 then
-    wmake $makeType MGridGenGamgAgglomeration
+    wmake $targetType MGridGenGamgAgglomeration
 fi
 
-wmake $makeType pairPatchAgglomeration
+wmake $targetType pairPatchAgglomeration
 
 
 ## get SCOTCH_VERSION, SCOTCH_ARCH_PATH
-#if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
-#then
-#    . $settings
-#    echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
-#else
-#    echo
-#    echo "Error: no config/scotch.sh settings"
-#    echo
-#fi
-#
-#if [ -n "$SCOTCH_ARCH_PATH" ]
-#then
-#    wmake $makeType scotchGamgAgglomeration
-#fi
+if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
+then
+    . $settings
+    echo "using SCOTCH_ARCH_PATH=$SCOTCH_ARCH_PATH"
+else
+    echo
+    echo "Error: no config/scotch.sh settings"
+    echo
+fi
+
+if [ -n "$SCOTCH_ARCH_PATH" ]
+then
+    wmake $targetType scotchGamgAgglomeration
+fi
 
 
 # ----------------------------------------------------------------- end-of-file

src/lagrangian/Allwmake

@@ -1,18 +1,21 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType distributionModels
-wmake $makeType basic
-wmake $makeType solidParticle
-wmake $makeType intermediate
-wmake $makeType turbulence
-wmake $makeType Turbulence
-wmake $makeType spray
-wmake $makeType dsmc
-wmake $makeType coalCombustion
+wmake $targetType distributionModels
+wmake $targetType basic
+wmake $targetType solidParticle
+wmake $targetType intermediate
+wmake $targetType turbulence
+wmake $targetType Turbulence
+wmake $targetType spray
+wmake $targetType dsmc
+wmake $targetType coalCombustion
 
-molecularDynamics/Allwmake $*
+molecularDynamics/Allwmake $targetType $*
 
 # ----------------------------------------------------------------- end-of-file

src/lagrangian/molecularDynamics/Allwmake

@@ -1,10 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType potential
-wmake $makeType molecularMeasurements
-wmake $makeType molecule
+wmake $targetType potential
+wmake $targetType molecularMeasurements
+wmake $targetType molecule
 
 # ----------------------------------------------------------------- end-of-file

src/mesh/Allwmake

@@ -1,10 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType autoMesh
-wmake $makeType blockMesh
-wmake $makeType extrudeModel
+wmake $targetType autoMesh
+wmake $targetType blockMesh
+wmake $targetType extrudeModel
 
 # ----------------------------------------------------------------- end-of-file

src/parallel/Allwmake

@@ -1,11 +1,14 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-decompose/Allwmake $*
-reconstruct/Allwmake $*
-wmake $makeType distributed
+decompose/Allwmake $targetType $*
+reconstruct/Allwmake $targetType $*
+wmake $targetType distributed
 
 
 # ----------------------------------------------------------------- end-of-file

src/parallel/decompose/Allwmake

@@ -1,6 +1,9 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 # get SCOTCH_VERSION, SCOTCH_ARCH_PATH
 if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/scotch.sh`
@@ -15,7 +18,7 @@ fi
 
 
 #
-# define how to create an mpi-versioned library of $makeType
+# define how to create an mpi-versioned library of $targetType
 # compile into qualified directory
 # use sentinel file to handle version changes
 #
@@ -26,11 +29,11 @@ wmakeMpiLib()
     do
     (
         WM_OPTIONS="$WM_OPTIONS$WM_MPLIB"
-        whichmpi="$libName/Make/$WM_OPTIONS/using:$FOAM_MPI"
-        whichscotch="$libName/Make/$WM_OPTIONS/using:$SCOTCH_VERSION"
+        whichmpi="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$FOAM_MPI"
+        whichscotch="$WM_PROJECT_DIR/platforms/$WM_OPTIONS/src/parallel/decompose/$libName/using:$SCOTCH_VERSION"
         [ -e "$whichmpi" -a -e "$whichscotch" ] || wclean $libName
-        echo "wmake $makeType $libName"
-        wmake $makeType $libName
+        echo "wmake $targetType $libName"
+        wmake $targetType $libName
         touch "$whichmpi" "$whichscotch"
     )
     done
@@ -43,16 +46,18 @@ wmakeLnInclude decompositionMethods
 
 if [ -n "$SCOTCH_ARCH_PATH" ]
 then
-    wmake $makeType scotchDecomp
+    wmake $targetType scotchDecomp
 
     if [ -d "$FOAM_LIBBIN/$FOAM_MPI" ]
     then
         #- Bit of a hack: ptscotch 6 requires scotch linked as well as. Can be
         #  removed once ptscotch declares dependency on scotch itself.
-        if [ "$SCOTCH_VERSION" = "scotch_6.0.0" ]
-        then
+        case "$SCOTCH_VERSION" in
+        scotch_6.*)
             export LINK_FLAGS="-lscotch"
-        fi
+            ;;
+        esac
+
 
         wmakeMpiLib ptscotchDecomp
     fi
@@ -64,11 +69,11 @@ fi
 
 
 # Try and build metisDecomp (has own logic)
-(cd metisDecomp && ./Allwmake $makeType)
+(cd metisDecomp && ./Allwmake $targetType)
 
 
-wmake $makeType decompositionMethods
+wmake $targetType decompositionMethods
 
-wmake $makeType decompose
+wmake $targetType decompose
 
 # ----------------------------------------------------------------- end-of-file

src/parallel/decompose/AllwmakeLnInclude

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 set -x
 
 wmakeLnInclude decompositionMethods

src/parallel/decompose/metisDecomp/Allwmake

@@ -1,6 +1,9 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 # get METIS_VERSION, METIS_ARCH_PATH
 if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/metis.sh`
@@ -9,7 +12,7 @@ then
     echo "using METIS_ARCH_PATH=$METIS_ARCH_PATH"
     if [ -r $METIS_ARCH_PATH/lib/libmetis.so ]
     then
-        wmake $makeType
+        wmake $targetType
     fi
 else
     echo

src/parallel/reconstruct/Allwmake

@@ -1,8 +1,11 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType reconstruct
+wmake $targetType reconstruct
 
 # ----------------------------------------------------------------- end-of-file

src/postProcessing/Allwmake

@@ -1,11 +1,14 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake ${1:-libo} postCalc
-wmake $makeType foamCalcFunctions
+wmake $targetType foamCalcFunctions
 
-functionObjects/Allwmake $*
+functionObjects/Allwmake $targetType $*
 
 # ----------------------------------------------------------------- end-of-file

src/postProcessing/functionObjects/Allwmake

@@ -1,15 +1,18 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType cloud
-wmake $makeType field
-wmake $makeType forces
-wmake $makeType fvTools
-wmake $makeType IO
-wmake $makeType jobControl
-wmake $makeType systemCall
-wmake $makeType utilities
+wmake $targetType cloud
+wmake $targetType field
+wmake $targetType forces
+wmake $targetType fvTools
+wmake $targetType IO
+wmake $targetType jobControl
+wmake $targetType systemCall
+wmake $targetType utilities
 
 # ----------------------------------------------------------------- end-of-file

src/regionModels/Allwclean

@@ -1,5 +1,5 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
+cd ${0%/*} || exit 1    # Run from this directory
 makeType=${1:-libso}
 set -x
 

src/regionModels/Allwmake

@@ -1,14 +1,17 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType regionModel
-wmake $makeType pyrolysisModels
-wmake $makeType surfaceFilmModels
-wmake $makeType surfaceFilmModels/derivedFvPatchFields/wallFunctions
-wmake $makeType thermalBaffleModels
-wmake $makeType regionCoupling
+wmake $targetType regionModel
+wmake $targetType pyrolysisModels
+wmake $targetType surfaceFilmModels
+wmake $targetType surfaceFilmModels/derivedFvPatchFields/wallFunctions
+wmake $targetType thermalBaffleModels
+wmake $targetType regionCoupling
 
 
 # ----------------------------------------------------------------- end-of-file

src/renumber/Allwmake

@@ -1,6 +1,9 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 ## get ZOLTAN_ARCH_PATH
 #if settings=`$WM_PROJECT_DIR/bin/foamEtcFile config/zoltan.sh`
@@ -16,11 +19,11 @@ makeType=${1:-libso}
 
 set -x
 
-wmake $makeType renumberMethods
+wmake $targetType renumberMethods
 
 if [ -n "$BOOST_ARCH_PATH" ]
 then
-    wmake $makeType SloanRenumber
+    wmake $targetType SloanRenumber
 else
     echo
     echo "Skipping SloanRenumber"
@@ -30,7 +33,7 @@ fi
 
 if [ -n "$ZOLTAN_ARCH_PATH" ]
 then
-    wmake $makeType zoltanRenumber
+    wmake $targetType zoltanRenumber
 else
     echo
     echo "Skipping zoltanRenumber"

src/thermophysicalModels/Allwmake

@@ -1,24 +1,27 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType specie
-wmake $makeType solidSpecie
-wmake $makeType thermophysicalFunctions
-./properties/Allwmake $*
+wmake $targetType specie
+wmake $targetType solidSpecie
+wmake $targetType thermophysicalFunctions
+./properties/Allwmake $targetType $*
 
-wmake $makeType basic
-wmake $makeType reactionThermo
-wmake $makeType laminarFlameSpeed
-wmake $makeType chemistryModel
-wmake $makeType barotropicCompressibilityModel
-wmake $makeType SLGThermo
+wmake $targetType basic
+wmake $targetType reactionThermo
+wmake $targetType laminarFlameSpeed
+wmake $targetType chemistryModel
+wmake $targetType barotropicCompressibilityModel
+wmake $targetType SLGThermo
 
 
-wmake $makeType solidThermo
-wmake $makeType solidChemistryModel
+wmake $targetType solidThermo
+wmake $targetType solidChemistryModel
 
-wmake $makeType radiationModels
+wmake $targetType radiationModels
 
 # ----------------------------------------------------------------- end-of-file

src/thermophysicalModels/properties/Allwmake

@@ -1,12 +1,15 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType liquidProperties
-wmake $makeType liquidMixtureProperties
-wmake $makeType solidProperties
-wmake $makeType solidMixtureProperties
+wmake $targetType liquidProperties
+wmake $targetType liquidMixtureProperties
+wmake $targetType solidProperties
+wmake $targetType solidMixtureProperties
 
 
 # ----------------------------------------------------------------- end-of-file

src/thermophysicalModels/reactionThermo/Make/files

@@ -1,5 +1,5 @@
 chemistryReaders/chemkinReader/chemkinReader.C
-chemistryReaders/chemkinReader/chemkinLexer.C
+chemistryReaders/chemkinReader/chemkinLexer.L
 chemistryReaders/chemistryReader/makeChemistryReaders.C
 
 mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C

src/transportModels/Allwmake

@@ -1,13 +1,16 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType twoPhaseMixture
-wmake $makeType interfaceProperties
-wmake $makeType twoPhaseProperties
-wmake $makeType incompressible
-wmake $makeType compressible
-wmake $makeType immiscibleIncompressibleTwoPhaseMixture
+wmake $targetType twoPhaseMixture
+wmake $targetType interfaceProperties
+wmake $targetType twoPhaseProperties
+wmake $targetType incompressible
+wmake $targetType compressible
+wmake $targetType immiscibleIncompressibleTwoPhaseMixture
 
 # ----------------------------------------------------------------- end-of-file

src/turbulenceModels/Allwmake

@@ -1,11 +1,14 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-LES/Allwmake $*
-incompressible/Allwmake $*
-compressible/Allwmake $*
-wmake $makeType derivedFvPatchFields
+LES/Allwmake $targetType $*
+incompressible/Allwmake $targetType $*
+compressible/Allwmake $targetType $*
+wmake $targetType derivedFvPatchFields
 
 # ----------------------------------------------------------------- end-of-file

src/turbulenceModels/LES/Allwmake

@@ -1,11 +1,14 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmakeLnInclude ../incompressible/LES
 
-wmake $makeType LESfilters
-wmake $makeType LESdeltas
+wmake $targetType LESfilters
+wmake $targetType LESdeltas
 
 # ----------------------------------------------------------------- end-of-file

src/turbulenceModels/compressible/Allwmake

@@ -1,10 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType turbulenceModel
-wmake $makeType RAS
-wmake $makeType LES
+wmake $targetType turbulenceModel
+wmake $targetType RAS
+wmake $targetType LES
 
 # ----------------------------------------------------------------- end-of-file

src/turbulenceModels/incompressible/Allwmake

@@ -1,10 +1,13 @@
 #!/bin/sh
-cd ${0%/*} || exit 1    # run from this directory
-makeType=${1:-libso}
+cd ${0%/*} || exit 1    # Run from this directory
+
+# Parse arguments for library compilation
+targetType=libso
+. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-wmake $makeType turbulenceModel
-wmake $makeType RAS
-wmake $makeType LES
+wmake $targetType turbulenceModel
+wmake $targetType RAS
+wmake $targetType LES
 
 # ----------------------------------------------------------------- end-of-file