From dea6a3c6e80de18e4a4a758f48f2a5accd5c44bb Mon Sep 17 00:00:00 2001
From: Henry Weller <http://cfd.direct>
Date: Fri, 24 Jun 2016 15:25:11 +0100
Subject: [PATCH] wmake/Allwmake: Completed support for targetType 'objects'
Patch contributed by Mattijs Janssens
---
Allwmake | 1 -
applications/Allwmake | 5 ++---
.../compressible/rhoCentralFoam/Allwmake | 3 +--
.../solvers/lagrangian/DPMFoam/Allwmake | 6 +++---
.../multiphase/compressibleInterFoam/Allwmake | 6 +++---
.../compressibleMultiphaseInterFoam/Allwmake | 3 +--
.../solvers/multiphase/driftFluxFoam/Allwmake | 3 +--
.../multiphase/interPhaseChangeFoam/Allwmake | 5 ++---
.../multiphase/multiphaseEulerFoam/Allwmake | 3 +--
.../multiphase/multiphaseInterFoam/Allwmake | 5 ++---
.../multiphase/reactingEulerFoam/Allwmake | 5 ++---
.../reactingMultiphaseEulerFoam/Allwmake | 3 +--
.../reactingTwoPhaseEulerFoam/Allwmake | 3 +--
.../multiphase/twoPhaseEulerFoam/Allwmake | 3 +--
.../mesh/conversion/Optional/Allwmake | 2 +-
.../utilities/mesh/generation/Allwmake | 10 +++++-----
.../mesh/generation/extrude2DMesh/Allwmake | 3 +--
.../mesh/generation/foamyMesh/Allwmake | 11 +++++------
.../foamyHexMeshSurfaceSimplify/Allwmake | 2 +-
.../mesh/manipulation/renumberMesh/Allwmake | 2 +-
.../mesh/manipulation/setSet/Allwmake | 2 +-
.../utilities/miscellaneous/foamHelp/Allwmake | 4 +---
.../dataConversion/foamToTecplot360/Allwmake | 2 +-
.../dataConversion/foamToVTK/Allwmake | 3 +--
.../graphics/PV3Readers/Allwmake | 5 ++---
.../PV3Readers/PV3FoamReader/Allwmake | 19 +++++++++++--------
.../PV3Readers/PV3blockMeshReader/Allwmake | 19 +++++++++++--------
.../graphics/PVReaders/Allwmake | 5 ++---
.../graphics/PVReaders/PVFoamReader/Allwmake | 19 +++++++++++--------
.../PVReaders/PVblockMeshReader/Allwmake | 19 +++++++++++--------
.../graphics/ensightFoamReader/Allwmake | 1 -
.../preProcessing/wallFunctionTable/Allwmake | 3 +--
src/Allwmake | 3 +--
src/Pstream/Allwmake | 1 -
src/TurbulenceModels/Allwmake | 1 -
src/conversion/Allwmake | 1 -
src/dummyThirdParty/Allwmake | 1 -
src/functionObjects/Allwmake | 1 -
src/fvAgglomerationMethods/Allwmake | 1 -
src/lagrangian/Allwmake | 1 -
src/lagrangian/molecularDynamics/Allwmake | 1 -
src/mesh/Allwmake | 1 -
src/parallel/Allwmake | 1 -
src/parallel/decompose/Allwclean | 1 -
src/parallel/decompose/Allwmake | 1 -
src/parallel/decompose/metisDecomp/Allwmake | 1 -
src/parallel/reconstruct/Allwmake | 1 -
src/regionModels/Allwmake | 1 -
src/renumber/Allwmake | 1 -
src/thermophysicalModels/Allwmake | 1 -
src/thermophysicalModels/properties/Allwmake | 1 -
src/transportModels/Allwmake | 1 -
wmake/scripts/AllwmakeParseArguments | 9 +++------
wmake/wmake | 12 +++++++++++-
54 files changed, 103 insertions(+), 125 deletions(-)
diff --git a/Allwmake b/Allwmake
index cf49e407b7d..8eac144fe82 100755
--- a/Allwmake
+++ b/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" || {
diff --git a/applications/Allwmake b/applications/Allwmake
index 23c5ebbae06..14ba388bf17 100755
--- a/applications/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/compressible/rhoCentralFoam/Allwmake b/applications/solvers/compressible/rhoCentralFoam/Allwmake
index c85e4594578..8595a53d01f 100755
--- a/applications/solvers/compressible/rhoCentralFoam/Allwmake
+++ b/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)
#------------------------------------------------------------------------------
diff --git a/applications/solvers/lagrangian/DPMFoam/Allwmake b/applications/solvers/lagrangian/DPMFoam/Allwmake
index f3f30648d50..9f702db886d 100755
--- a/applications/solvers/lagrangian/DPMFoam/Allwmake
+++ b/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
diff --git a/applications/solvers/multiphase/compressibleInterFoam/Allwmake b/applications/solvers/multiphase/compressibleInterFoam/Allwmake
index b658bde4575..6542a62356d 100755
--- a/applications/solvers/multiphase/compressibleInterFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake b/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
index 025a2399e86..2a3c534c307 100755
--- a/applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/driftFluxFoam/Allwmake b/applications/solvers/multiphase/driftFluxFoam/Allwmake
index 0c8b6bb8f9d..e4af29196aa 100755
--- a/applications/solvers/multiphase/driftFluxFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake b/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
index c25175e5e6e..c0ac039a551 100755
--- a/applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
index 6f95f807ac0..d81a6d71a87 100755
--- a/applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake b/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
index 4d2775a8b89..000e9f77432 100755
--- a/applications/solvers/multiphase/multiphaseInterFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/Allwmake
index 0757f76b3fd..f67d35aa292 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/Allwmake
+++ b/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 $*
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
index 42f430bf17f..ea7fab7a826 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
index a0ff46153ae..d151b361df1 100755
--- a/applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake b/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
index 16e2ad39ab0..a73a5ce4169 100755
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index cb0064789a0..1ac99007a72 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/Allwmake b/applications/utilities/mesh/generation/Allwmake
index 1ee5b816c27..5beed0b5556 100755
--- a/applications/utilities/mesh/generation/Allwmake
+++ b/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
diff --git a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake b/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
index 72ed5c7d1eb..37a2358c583 100755
--- a/applications/utilities/mesh/generation/extrude2DMesh/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/foamyMesh/Allwmake b/applications/utilities/mesh/generation/foamyMesh/Allwmake
index 17241fde089..76027b0ad94 100755
--- a/applications/utilities/mesh/generation/foamyMesh/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
index 5a714fca98c..280efe9bdf9 100755
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
@@ -7,7 +7,7 @@ set -x
if [ -d "${FASTDUALOCTREE_SRC_PATH}" ]
then
- wmake
+ wmake $targetType
fi
#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
index 34b8b78d2f1..3acf4a1da70 100755
--- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
+++ b/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
#------------------------------------------------------------------------------
diff --git a/applications/utilities/mesh/manipulation/setSet/Allwmake b/applications/utilities/mesh/manipulation/setSet/Allwmake
index 2822be02b89..ce9bef7333f 100755
--- a/applications/utilities/mesh/manipulation/setSet/Allwmake
+++ b/applications/utilities/mesh/manipulation/setSet/Allwmake
@@ -16,6 +16,6 @@ then
export LINK_FLAGS="-lreadline"
fi
-wmake
+wmake $targetType
#------------------------------------------------------------------------------
diff --git a/applications/utilities/miscellaneous/foamHelp/Allwmake b/applications/utilities/miscellaneous/foamHelp/Allwmake
index 2c97cd692f0..87d2293c26c 100755
--- a/applications/utilities/miscellaneous/foamHelp/Allwmake
+++ b/applications/utilities/miscellaneous/foamHelp/Allwmake
@@ -2,12 +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 helpTypes
-wmake
-
+wmake $targetType
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
index df9634c1120..d2cc359d9e0 100755
--- a/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
+++ b/applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
@@ -8,7 +8,7 @@ if [ ! -d ${WM_THIRD_PARTY_DIR}/tecio ]
then
echo "Did not find tecio in ${WM_THIRD_PARTY_DIR}. Not building foamToTecplot360."
else
- wmake
+ wmake $targetType
fi
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake b/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
index 98c411d2af7..150ac3019a1 100755
--- a/applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
+++ b/applications/utilities/postProcessing/dataConversion/foamToVTK/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 foamToVTK
-wmake
+wmake $targetType
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
index 049c1bfca0e..60fdc4918cf 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/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
@@ -19,8 +18,8 @@ case "$ParaView_VERSION" in
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
wmake $targetType vtkPV3Readers
- PV3blockMeshReader/Allwmake $*
- PV3FoamReader/Allwmake $*
+ PV3blockMeshReader/Allwmake $targetType $*
+ PV3FoamReader/Allwmake $targetType $*
else
echo "ERROR: ParaView not found in $ParaView_DIR"
fi
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
index 08602d37edf..05d46f149e0 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
@@ -2,20 +2,23 @@
cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
-targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
wmake $targetType vtkPV3Foam
- (
- cd PV3FoamReader
- mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
- cd Make/$WM_OPTIONS
- cmake ../..
- make
- )
+
+ if [ "$targetType" != "objects" ]
+ then
+ (
+ cd PV3FoamReader
+ mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+ cd Make/$WM_OPTIONS
+ cmake ../..
+ make
+ )
+ fi
fi
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
index 48e136d2094..241091e0c5f 100755
--- a/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
@@ -2,20 +2,23 @@
cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
-targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
wmake $targetType vtkPV3blockMesh
- (
- cd PV3blockMeshReader
- mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
- cd Make/$WM_OPTIONS
- cmake ../..
- make
- )
+
+ if [ "$targetType" != "objects" ]
+ then
+ (
+ cd PV3blockMeshReader
+ mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+ cd Make/$WM_OPTIONS
+ cmake ../..
+ make
+ )
+ fi
fi
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
index edaa31a37b0..85bd2040d12 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/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
@@ -19,8 +18,8 @@ case "$ParaView_VERSION" in
[ -n "$WM_CXX" ] && export CXX="$WM_CXX"
wmake $targetType vtkPVReaders
- PVblockMeshReader/Allwmake $*
- PVFoamReader/Allwmake $*
+ PVblockMeshReader/Allwmake $targetType $*
+ PVFoamReader/Allwmake $targetType $*
else
echo "ERROR: ParaView not found in $ParaView_DIR"
fi
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
index 70b8845d4bd..adb0bfb3c03 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
@@ -2,20 +2,23 @@
cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
-targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
wmake $targetType vtkPVFoam
- (
- cd PVFoamReader
- mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
- cd Make/$WM_OPTIONS
- cmake ../..
- make
- )
+
+ if [ "$targetType" != "objects" ]
+ then
+ (
+ cd PVFoamReader
+ mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+ cd Make/$WM_OPTIONS
+ cmake ../..
+ make
+ )
+ fi
fi
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
index 54b75743f90..992e835a657 100755
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
@@ -2,20 +2,23 @@
cd ${0%/*} || exit 1 # Run from this directory
# Parse arguments for library compilation
-targetType=libso
. $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
set -x
if [ -d "$ParaView_DIR" -a -r "$ParaView_DIR" ]
then
wmake $targetType vtkPVblockMesh
- (
- cd PVblockMeshReader
- mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
- cd Make/$WM_OPTIONS
- cmake ../..
- make
- )
+
+ if [ "$targetType" != "objects" ]
+ then
+ (
+ cd PVblockMeshReader
+ mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
+ cd Make/$WM_OPTIONS
+ cmake ../..
+ make
+ )
+ fi
fi
#------------------------------------------------------------------------------
diff --git a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake b/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
index 7a5f1a0863a..2471b6d55ab 100755
--- a/applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
+++ b/applications/utilities/postProcessing/graphics/ensightFoamReader/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
wmake $targetType
diff --git a/applications/utilities/preProcessing/wallFunctionTable/Allwmake b/applications/utilities/preProcessing/wallFunctionTable/Allwmake
index 63dbf325bed..2aa17958a95 100755
--- a/applications/utilities/preProcessing/wallFunctionTable/Allwmake
+++ b/applications/utilities/preProcessing/wallFunctionTable/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 tabulatedWallFunction
-wmake
+wmake $targetType
#------------------------------------------------------------------------------
diff --git a/src/Allwmake b/src/Allwmake
index ef59d69ba9d..6419e510a5a 100755
--- a/src/Allwmake
+++ b/src/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/src" || {
@@ -27,7 +26,7 @@ wmakeLnInclude OpenFOAM
wmakeLnInclude OSspecific/${WM_OSTYPE:-POSIX}
Pstream/Allwmake $targetType $*
-OSspecific/${WM_OSTYPE:-POSIX}/Allwmake $*
+OSspecific/${WM_OSTYPE:-POSIX}/Allwmake $targetType $*
wmake $targetType OpenFOAM
wmake $targetType fileFormats
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index 218eae9c3a1..617ae9ad342 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/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
diff --git a/src/TurbulenceModels/Allwmake b/src/TurbulenceModels/Allwmake
index b37d9ac294c..630178d1566 100755
--- a/src/TurbulenceModels/Allwmake
+++ b/src/TurbulenceModels/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
diff --git a/src/conversion/Allwmake b/src/conversion/Allwmake
index 9c20d87a757..4b81d4b8c1a 100755
--- a/src/conversion/Allwmake
+++ b/src/conversion/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
diff --git a/src/dummyThirdParty/Allwmake b/src/dummyThirdParty/Allwmake
index fed1e16fda8..e67e3de741f 100755
--- a/src/dummyThirdParty/Allwmake
+++ b/src/dummyThirdParty/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
diff --git a/src/functionObjects/Allwmake b/src/functionObjects/Allwmake
index 7e4c72f3cee..4322aec4e7d 100755
--- a/src/functionObjects/Allwmake
+++ b/src/functionObjects/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
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index f5cfa2cc5b8..c8451dbd673 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/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
diff --git a/src/lagrangian/Allwmake b/src/lagrangian/Allwmake
index b1460c7db4d..3d09e66bf56 100755
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/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
diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake
index b8572066726..8a53eb6fb61 100755
--- a/src/lagrangian/molecularDynamics/Allwmake
+++ b/src/lagrangian/molecularDynamics/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
diff --git a/src/mesh/Allwmake b/src/mesh/Allwmake
index 9fc260a1a19..796b508d346 100755
--- a/src/mesh/Allwmake
+++ b/src/mesh/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
diff --git a/src/parallel/Allwmake b/src/parallel/Allwmake
index 9976f017a65..2f1cf312705 100755
--- a/src/parallel/Allwmake
+++ b/src/parallel/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
diff --git a/src/parallel/decompose/Allwclean b/src/parallel/decompose/Allwclean
index f984966f859..897eed71b72 100755
--- a/src/parallel/decompose/Allwclean
+++ b/src/parallel/decompose/Allwclean
@@ -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
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index c692633e506..3be5235ee00 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/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
# get SCOTCH_VERSION, SCOTCH_ARCH_PATH
diff --git a/src/parallel/decompose/metisDecomp/Allwmake b/src/parallel/decompose/metisDecomp/Allwmake
index d968333287d..2f666aba2bb 100755
--- a/src/parallel/decompose/metisDecomp/Allwmake
+++ b/src/parallel/decompose/metisDecomp/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
# get METIS_VERSION, METIS_ARCH_PATH
diff --git a/src/parallel/reconstruct/Allwmake b/src/parallel/reconstruct/Allwmake
index ab8f2d4b84e..647a42cb3de 100755
--- a/src/parallel/reconstruct/Allwmake
+++ b/src/parallel/reconstruct/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
diff --git a/src/regionModels/Allwmake b/src/regionModels/Allwmake
index b9f85d1b278..c8e86eef7d6 100755
--- a/src/regionModels/Allwmake
+++ b/src/regionModels/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
diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake
index a44d239870b..66816802312 100755
--- a/src/renumber/Allwmake
+++ b/src/renumber/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
# Get CGAL and scotch versions
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 1d987bb0dba..5df22b24b82 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/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
diff --git a/src/thermophysicalModels/properties/Allwmake b/src/thermophysicalModels/properties/Allwmake
index b8ec5164160..e2da041c684 100755
--- a/src/thermophysicalModels/properties/Allwmake
+++ b/src/thermophysicalModels/properties/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
diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake
index c580b5bbe73..4fcc281a6ef 100755
--- a/src/transportModels/Allwmake
+++ b/src/transportModels/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
diff --git a/wmake/scripts/AllwmakeParseArguments b/wmake/scripts/AllwmakeParseArguments
index d77c86fab28..334a435ac52 100644
--- a/wmake/scripts/AllwmakeParseArguments
+++ b/wmake/scripts/AllwmakeParseArguments
@@ -28,9 +28,6 @@
# Allwmake argument parser
#
# Usage
-# # Declare the targetType and set to default for library building
-# targetType=libso # lib, libo or libso
-#
# # Declare genDoc and set to default if documentation building is supported
# genDoc=0 # 0 or 1
#
@@ -65,11 +62,12 @@ USAGE
USAGE_DOC
# Print options for building libraries
- test -n "$targetType" && cat<<USAGE_LIB
+cat<<USAGE_LIB
lib Compile statically linked archive lib (.a)
libo Compile statically linked lib (.o)
libso Compile dynamically linked lib (.so)
dep Compile dependency files
+ objects Compile only
USAGE_LIB
exit 1
@@ -145,8 +143,7 @@ do
genDoc=1
;;
# Specify target type
- lib | libo | libso | dep)
- test -n "$targetType" || usage "invalid option '$1'"
+ lib | libo | libso | dep | objects)
targetType=$1
;;
--)
diff --git a/wmake/wmake b/wmake/wmake
index 821c5bbf22c..6d3f116d99c 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -83,6 +83,7 @@ or a special target:
libso Compile dynamically linked lib (.so)
dep Compile lnInclude and dependencies only
updatedep Compile dependencies only (in case of broken dependencies)
+ objects Compile but not link
USAGE
exit 1
@@ -217,7 +218,7 @@ if [ "$all" = "all" ]
then
if [ -e Allwmake ]
then
- ./Allwmake
+ ./Allwmake $targetType
exit $?
else
# Have to keep track of the main exit code for the call to "make"
@@ -322,6 +323,15 @@ then
then
targetType=libso
fi
+elif grep -e '^ *EXE *=' "$MakeDir/files" >/dev/null 2>&1
+then
+ # Application. Remove any nonsense targetType
+ case "$targetType" in
+ lib*)
+ unset targetType
+ break
+ ;;
+ esac
fi
--
GitLab