wmake/Allwmake: Completed support for targetType 'objects'

Patch contributed by Mattijs Janssens

Allwmake

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

applications/Allwmake

@@ -2,7 +2,6 @@
 cd ${0%/*} || exit 1    # Run from this directory
 
 # Parse arguments for library compilation
-targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
 wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
@@ -20,8 +19,8 @@ wmakeCheckPwd "$WM_PROJECT_DIR/applications" || {
 
 set -x
 
-wmake -all solvers $*
+wmake -all $targetType solvers
-wmake -all utilities $*
+wmake -all $targetType utilities
 
 
 #------------------------------------------------------------------------------

applications/solvers/compressible/rhoCentralFoam/Allwmake

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

applications/solvers/lagrangian/DPMFoam/Allwmake

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

applications/solvers/multiphase/compressibleInterFoam/Allwmake

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

applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake

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

applications/solvers/multiphase/driftFluxFoam/Allwmake

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

applications/solvers/multiphase/interPhaseChangeFoam/Allwmake

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

applications/solvers/multiphase/multiphaseEulerFoam/Allwmake

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

applications/solvers/multiphase/multiphaseInterFoam/Allwmake

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

applications/solvers/multiphase/reactingEulerFoam/Allwmake

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

applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake

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

applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake

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

applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake

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

applications/utilities/mesh/conversion/Optional/Allwmake

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

applications/utilities/mesh/generation/Allwmake

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

applications/utilities/mesh/generation/extrude2DMesh/Allwmake

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

applications/utilities/mesh/generation/foamyMesh/Allwmake

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

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

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

applications/utilities/mesh/manipulation/renumberMesh/Allwmake

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

applications/utilities/mesh/manipulation/setSet/Allwmake

@@ -16,6 +16,6 @@ then
     export LINK_FLAGS="-lreadline"
 fi
 
-wmake
+wmake $targetType
 
 #------------------------------------------------------------------------------

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
-
 
 #------------------------------------------------------------------------------

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
 
 #------------------------------------------------------------------------------

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
 
 #------------------------------------------------------------------------------

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 $*
+        PV3blockMeshReader/Allwmake $targetType $*
-        PV3FoamReader/Allwmake $*
+        PV3FoamReader/Allwmake $targetType $*
     else
         echo "ERROR: ParaView not found in $ParaView_DIR"
     fi

applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake

@@ -2,13 +2,15 @@
 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
+
+    if [ "$targetType" != "objects" ]
+    then
         (
             cd PV3FoamReader
             mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
@@ -17,5 +19,6 @@ then
             make
         )
     fi
+fi
 
 #------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake

@@ -2,13 +2,15 @@
 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
+
+    if [ "$targetType" != "objects" ]
+    then
         (
             cd PV3blockMeshReader
             mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
@@ -17,5 +19,6 @@ then
             make
         )
     fi
+fi
 
 #------------------------------------------------------------------------------

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 $*
+        PVblockMeshReader/Allwmake $targetType $*
-        PVFoamReader/Allwmake $*
+        PVFoamReader/Allwmake $targetType $*
     else
         echo "ERROR: ParaView not found in $ParaView_DIR"
     fi

applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake

@@ -2,13 +2,15 @@
 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
+
+    if [ "$targetType" != "objects" ]
+    then
         (
             cd PVFoamReader
             mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
@@ -17,5 +19,6 @@ then
             make
         )
     fi
+fi
 
 #------------------------------------------------------------------------------

applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake

@@ -2,13 +2,15 @@
 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
+
+    if [ "$targetType" != "objects" ]
+    then
         (
             cd PVblockMeshReader
             mkdir -p Make/$WM_OPTIONS > /dev/null 2>&1
@@ -17,5 +19,6 @@ then
             make
         )
     fi
+fi
 
 #------------------------------------------------------------------------------

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

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
 
 #------------------------------------------------------------------------------

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

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
 
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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
 

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

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

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

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
 

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
 

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

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
 

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
 

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
 

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)
+        lib | libo | libso | dep | objects)
-            test -n "$targetType" || usage "invalid option '$1'"
             targetType=$1
             ;;
         --)

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