wmake/Allwmake: Completed support for targetType 'objects'

Patch contributed by Mattijs Janssens

Allwmake

@@ -3,7 +3,6 @@ cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation without documentation by default
 genDoc=0
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmakeCheckPwd "$WM_PROJECT_DIR" || {

applications/Allwmake

@@ -2,7 +2,6 @@
 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/applications" || {
@@ -20,8 +19,8 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
 
 set -x
 
-wmake -all solvers $*
-wmake -all utilities $*
+wmake -all $targetType solvers
+wmake -all $targetType utilities
 
 
 #------------------------------------------------------------------------------

applications/solvers/compressible/rhoCentralFoam/Allwmake

@@ -2,10 +2,9 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
-(wmake $targetType BCs && wmake && wmake rhoCentralDyMFoam)
+(wmake $targetType BCs && wmake $targetType && wmake $targetType rhoCentralDyMFoam)
 
 #------------------------------------------------------------------------------

applications/solvers/lagrangian/DPMFoam/Allwmake

@@ -2,10 +2,10 @@
 cd ${0%/*} || exit 1
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType DPMTurbulenceModels
-wmake
-wmake MPPICFoam
+
+wmake $targetType
+wmake $targetType MPPICFoam

applications/solvers/multiphase/compressibleInterFoam/Allwmake

@@ -2,12 +2,12 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType twoPhaseMixtureThermo
-wmake
-wmake compressibleInterDyMFoam
+
+wmake $targetType
+wmake $targetType compressibleInterDyMFoam
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake

@@ -2,11 +2,10 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType multiphaseMixtureThermo
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/driftFluxFoam/Allwmake

@@ -2,12 +2,11 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType mixtureViscosityModels
 wmake $targetType relativeVelocityModels
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/interPhaseChangeFoam/Allwmake

@@ -2,12 +2,11 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType phaseChangeTwoPhaseMixtures
-wmake
-wmake interPhaseChangeDyMFoam
+wmake $targetType
+wmake $targetType interPhaseChangeDyMFoam
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/multiphaseEulerFoam/Allwmake

@@ -2,13 +2,12 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmakeLnInclude interfacialModels
 wmake $targetType multiphaseSystem
 wmake $targetType interfacialModels
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/multiphaseInterFoam/Allwmake

@@ -2,12 +2,11 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType multiphaseMixture
-wmake
-wmake multiphaseInterDyMFoam
+wmake $targetType
+wmake $targetType multiphaseInterDyMFoam
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/reactingEulerFoam/Allwmake

@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
@@ -11,7 +10,7 @@ wmakeLnInclude interfacialCompositionModels
 wmake $targetType phaseSystems
 wmake $targetType interfacialModels
 wmake $targetType interfacialCompositionModels
-reactingTwoPhaseEulerFoam/Allwmake $*
-reactingMultiphaseEulerFoam/Allwmake $*
+reactingTwoPhaseEulerFoam/Allwmake $targetType $*
+reactingMultiphaseEulerFoam/Allwmake $targetType $*
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake

@@ -2,12 +2,11 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType multiphaseSystem
 wmake $targetType multiphaseCompressibleTurbulenceModels
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake

@@ -2,12 +2,11 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType twoPhaseSystem
 wmake $targetType twoPhaseCompressibleTurbulenceModels
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake

@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
@@ -10,6 +9,6 @@ wmakeLnInclude interfacialModels
 wmake $targetType twoPhaseSystem
 wmake $targetType interfacialModels
 wmake $targetType phaseCompressibleTurbulenceModels
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

applications/utilities/mesh/conversion/Optional/Allwmake

@@ -14,7 +14,7 @@ $WM_THIRD_PARTY_DIR/AllwmakeLibccmio
 # if the library built properly, the headers should exist too
 if [ -e $FOAM_EXT_LIBBIN/libccmio.so ]
 then
-    wmake ccm26ToFoam
+    wmake $targetType ccm26ToFoam
 fi
 
 #------------------------------------------------------------------------------

applications/utilities/mesh/generation/Allwmake

@@ -11,14 +11,14 @@ _foamEval SOURCE_CGAL_VERSIONS_ONLY=yes \
 
 set -x
 
-wmake -all blockMesh
-wmake -all extrude
-wmake -all extrude2DMesh
-wmake -all snappyHexMesh
+wmake -all $targetType blockMesh
+wmake -all $targetType extrude
+wmake -all $targetType extrude2DMesh
+wmake -all $targetType snappyHexMesh
 
 if [ -n "$FOAMY_HEX_MESH" ]
 then
-    foamyMesh/Allwmake $*
+    foamyMesh/Allwmake $targetType $*
 fi
 
 

applications/utilities/mesh/generation/extrude2DMesh/Allwmake

@@ -2,11 +2,10 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType extrude2DMesh
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

applications/utilities/mesh/generation/foamyMesh/Allwmake

@@ -2,17 +2,16 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 set -x
 
 wmake $targetType conformalVoronoiMesh
 wmake $targetType conformalVoronoi2DMesh
-wmake foamyQuadMesh
-wmake foamyHexMesh
-#wmake foamyHexMeshBackgroundMesh
-#(cd foamyHexMeshSurfaceSimplify && ./Allwmake)
-#wmake cellSizeAndAlignmentGrid
 
+wmake $targetType foamyQuadMesh
+wmake $targetType foamyHexMesh
+#wmake $targetType foamyHexMeshBackgroundMesh
+#(cd foamyHexMeshSurfaceSimplify && ./Allwmake $targetType $*)
+#wmake $targetType cellSizeAndAlignmentGrid
 
 #------------------------------------------------------------------------------

applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake

@@ -7,7 +7,7 @@ set -x
 
 if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
 then
-    wmake
+    wmake $targetType
 fi
 
 #------------------------------------------------------------------------------

applications/utilities/mesh/manipulation/renumberMesh/Allwmake

@@ -21,6 +21,6 @@ then
     export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan"
 fi
 
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------