diff --git a/Allwmake b/Allwmake
index cf49e407b7dbc9b23d18cb6e785be4b13d7bda55..8eac144fe8237d82b64ee75ec7a3a9898db8ae56 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 23c5ebbae06bec2fffbe867684d8b92ac8376a2b..14ba388bf1779a1be6a3decedd9dce8ce17df86b 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 c85e4594578f6e5bcb79dd8cb7999670daa16a3c..8595a53d01fe6a28350a2f4c2cdf466488c0b516 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 f3f30648d50628f8f6f54ff200cc6639f9c90140..9f702db886d2722edcd774b14ba19ecf2cb02092 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 b658bde4575565fcf75161a9adf5651b5f343446..6542a62356dd345befc417be752d915bb17e32c7 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 025a2399e86b4fe7f583bde3332796381e8ca150..2a3c534c307ff0be1c1668187d7b4dd7e2d3e754 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 0c8b6bb8f9d4d90e7ef6512fb7ca6b5bcbe0d194..e4af29196aa1b93aed70b4cf932522a34344b6bd 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 c25175e5e6ec3c345f2943d26c3ca690a2fe1d00..c0ac039a551e308e0d72e46c43de161dd8868503 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 6f95f807ac078486ce6cc85ff07cf62ad4ccdf44..d81a6d71a873bb75f7b2f5c5c87006356d694527 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 4d2775a8b89edffdebd41aa3ad054abeef40a0d5..000e9f77432793bb6ad26e6596569a4fd07f3536 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 0757f76b3fd7a4473c441b5aee95fe5a43681179..f67d35aa292e86e819b9ae7266909b67ae053083 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 42f430bf17f475d0301a930da2c5591edebcd74a..ea7fab7a82614eab2900c064f59311040595211b 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 a0ff46153ae889ac4b4cc08ad05503da33be4663..d151b361df17e4ba1cf1a76e548d9ac6bbf8c88d 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 16e2ad39ab089817fb6f1f0070271ca963d5e254..a73a5ce4169e67fe95ad52f8af785c1b49d2b0da 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 cb0064789a0bb64c41045c5ca3c24981e89d5ee2..1ac99007a724312b8406e446b1b176eb761a9375 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 1ee5b816c27195105f461adc4f258203b408a765..5beed0b5556a0aee114e6b5ef90aa791e1628205 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 72ed5c7d1eb6242ee2532059be8bc211521f5c33..37a2358c583ce6a91084a83fbcfd825e8668cc3b 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 17241fde089720f1a8e2f71068ad90fa37c879c5..76027b0ad948be53782ec38469e4ed8b59370778 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 5a714fca98ceca95fa943f08f3a77de2da84e5b3..280efe9bdf96970a51bde85b283fdb5f472148ef 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 34b8b78d2f124a71d5ca66cbee1da2772ffaeeb5..3acf4a1da70abac63f3b9717d3da8e308f0cd901 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 2822be02b89230d4f434c95dd248e978b553cfba..ce9bef7333f3d44613079703727885ee1916b634 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 2c97cd692f03237771bfcf252e02217d8c724bc6..87d2293c26cdda0bec79d616720da31c23dc0194 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 df9634c1120842fc008fb83b458786c62b9e76a4..d2cc359d9e003f469d034eb92b1fdfd34dd13b77 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 98c411d2af78983adb85d38e9c04c87ea7d56c17..150ac3019a1694c64b273db6f3595ae754d8a2f6 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 049c1bfca0e34f3d2fd475222458c9ad88106dbb..60fdc4918cf52b1c4c5ca344563f96c08cb3df3e 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 08602d37edf03094b76a48165f7762c4c2031507..05d46f149e0722169dcd24a2a81cbd9c2da1aaa4 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 48e136d2094bd4da2f14a0bfdf6d2e647cb327f7..241091e0c5fc0b394f4489eb3022efbcaf2ff346 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 edaa31a37b0f0220cb1da079cf87b7c37a74e51f..85bd2040d12ca9f32fc651fd8f17238210b14cbd 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 70b8845d4bd7c93a1edbec99c57d8458dae054f4..adb0bfb3c038ba8f8b7a5ba7586fada0f9c6aaf6 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 54b75743f90ed014f8a5ad73cc8fdbfe18a62ca0..992e835a657b90c833ab3a57192e43408595b872 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 7a5f1a0863ae22ca3c4294caa22dffc8125ffcf9..2471b6d55ab7eef9d59961f2d83b4f3d41ef8205 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 63dbf325bed40513f05cd71108ebbbc63b864201..2aa17958a9516b17caef9b12382e3682eff7724e 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 ef59d69ba9d868f86929bfc067bcbd726bdeec97..6419e510a5aa6e52ee9d96af4af33a45d90a2c46 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 218eae9c3a1a7b28df32f903a6ada13fa7e8c97f..617ae9ad342008d7104561f73a140ea40605f6e9 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 b37d9ac294c0a35b3a7e8c277bd67bc9b7c7f447..630178d156625a991b5a97a80c34167a9f4c8bcd 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 9c20d87a7577c97caf2de68ee5e1b87b2e1a3eca..4b81d4b8c1ae4055194d3a4cc096607f750683a1 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 fed1e16fda86eeed3c810ae8ecdee00bd5f26466..e67e3de741f7c98aed7bf43e297dee3fd7bcba59 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 7e4c72f3cee20b68acacbb4c604d3f92ac88bd1b..4322aec4e7d276461eb7979cb8fb22036a43a6fb 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 f5cfa2cc5b88ecd698f30d349e0cc06c8892b5b7..c8451dbd673e2fe0faadfd8788776c4ce2bcdbea 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 b1460c7db4d2b70b5e25a472bb381b4c29d68c61..3d09e66bf56c332b49abacd6a6e840a2301a9eb5 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 b8572066726b0c9eab0f62e98808b8c33dfe25df..8a53eb6fb611efa362a386b8e86ab1ff2e0a7f05 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 9fc260a1a19f7f913c816aa41032deb44d206403..796b508d346a8e52825c475eff3c58039249034a 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 9976f017a6502e35b5913de17335d3fa1c16ec79..2f1cf312705c0d14cfc6d31ee2e694a11fdd1969 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 f984966f85963a633874e3b59cd10ea15d1b217a..897eed71b722610cc6d8d6b788f85c8ff98d7763 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 c692633e506880cff6d045574c28618ddd6134fd..3be5235ee00aa7cbd34c138d7508d703f0eee64c 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 d968333287d5d4e4eb5f8ab79691e3532c7b04dd..2f666aba2bb31c2c61e2d945562732b074b8bc2f 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 ab8f2d4b84ecbe025aa5287e859d9cd39fe54f24..647a42cb3de3e32f1e0f9e4e1539735d0225a16e 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 b9f85d1b2787ba45a6cdda4e217e252567d048e3..c8e86eef7d65f54a8952c5f4035fab7f1d455e1a 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 a44d239870bd4616d3a48019140425316d1b14cd..6681680231212cb158a546b39c2fb1f675d350e4 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 1d987bb0dbab3fe0fb36b557bafc268b79d1affe..5df22b24b82d8095a899bfb9575c9e9fcec88b6a 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 b8ec516416032882650bcf051111ae7bb48f331f..e2da041c684bd40f26fac6ade3002d38c1cea354 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 c580b5bbe7332ffadd83894352579213f329ff4e..4fcc281a6ef08d2d7f2825cbbee0642b93c9bdac 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 d77c86fab281e05a6178659e0a34d5b432df8a66..334a435ac528af9b919203032e6995a03f3997e8 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 821c5bbf22c527ece69da85db17a8f9878bbf5b1..6d3f116d99c0cb42335e4ecd4dd9a82df6cbb7be 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