diff --git a/Allwmake b/Allwmake index cf49e407b..8eac144fe 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 23c5ebbae..14ba388bf 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 c85e45945..8595a53d0 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 f3f30648d..9f702db88 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 b658bde45..6542a6235 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 025a2399e..2a3c534c3 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 0c8b6bb8f..e4af29196 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 c25175e5e..c0ac039a5 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 6f95f807a..d81a6d71a 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 4d2775a8b..000e9f774 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 0757f76b3..f67d35aa2 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 42f430bf1..ea7fab7a8 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 a0ff46153..d151b361d 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 16e2ad39a..a73a5ce41 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 cb0064789..1ac99007a 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 1ee5b816c..5beed0b55 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 72ed5c7d1..37a2358c5 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 17241fde0..76027b0ad 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 5a714fca9..280efe9bd 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 34b8b78d2..3acf4a1da 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 2822be02b..ce9bef733 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 2c97cd692..87d2293c2 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 df9634c11..d2cc359d9 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 98c411d2a..150ac3019 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 049c1bfca..60fdc4918 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 08602d37e..05d46f149 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 48e136d20..241091e0c 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 edaa31a37..85bd2040d 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 70b8845d4..adb0bfb3c 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 54b75743f..992e835a6 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 7a5f1a086..2471b6d55 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 63dbf325b..2aa17958a 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 ef59d69ba..6419e510a 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 218eae9c3..617ae9ad3 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 b37d9ac29..630178d15 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 9c20d87a7..4b81d4b8c 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 fed1e16fd..e67e3de74 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 7e4c72f3c..4322aec4e 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 f5cfa2cc5..c8451dbd6 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 b1460c7db..3d09e66bf 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 b85720667..8a53eb6fb 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 9fc260a1a..796b508d3 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 9976f017a..2f1cf3127 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 f984966f8..897eed71b 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 c692633e5..3be5235ee 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 d96833328..2f666aba2 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 ab8f2d4b8..647a42cb3 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 b9f85d1b2..c8e86eef7 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 a44d23987..668168023 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 1d987bb0d..5df22b24b 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 b8ec51641..e2da041c6 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 c580b5bbe..4fcc281a6 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 d77c86fab..334a435ac 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<