zhyang-dev/OpenFOAM-5.x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wmake/Allwmake: Completed support for targetType 'objects'

Browse Source 
Patch contributed by Mattijs Janssens
This commit is contained in:
Henry Weller
2016-06-24 15:25:11 +01:00
parent afa64919ec
commit 2cb97ec2ef
54 changed files with 103 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Allwmake
View File

@ -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" || {

5
applications/Allwmake
View File

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

3
applications/solvers/compressible/rhoCentralFoam/Allwmake
View File

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

6
applications/solvers/lagrangian/DPMFoam/Allwmake
View File

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

6
applications/solvers/multiphase/compressibleInterFoam/Allwmake
View File

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

3
applications/solvers/multiphase/compressibleMultiphaseInterFoam/Allwmake
View File

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

3
applications/solvers/multiphase/driftFluxFoam/Allwmake
View File

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

5
applications/solvers/multiphase/interPhaseChangeFoam/Allwmake
View File

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

3
applications/solvers/multiphase/multiphaseEulerFoam/Allwmake
View File

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

5
applications/solvers/multiphase/multiphaseInterFoam/Allwmake
View File

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

5
applications/solvers/multiphase/reactingEulerFoam/Allwmake
View File

@ -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 $*
#------------------------------------------------------------------------------

3
applications/solvers/multiphase/reactingEulerFoam/reactingMultiphaseEulerFoam/Allwmake
View File

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

3
applications/solvers/multiphase/reactingEulerFoam/reactingTwoPhaseEulerFoam/Allwmake
View File

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

3
applications/solvers/multiphase/twoPhaseEulerFoam/Allwmake
View File

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

2
applications/utilities/mesh/conversion/Optional/Allwmake
View File

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

10
applications/utilities/mesh/generation/Allwmake
View File

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

3
applications/utilities/mesh/generation/extrude2DMesh/Allwmake
View File

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

11
applications/utilities/mesh/generation/foamyMesh/Allwmake
View File

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

2
applications/utilities/mesh/generation/foamyMesh/foamyHexMeshSurfaceSimplify/Allwmake
View File

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

2
applications/utilities/mesh/manipulation/renumberMesh/Allwmake
View File

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

2
applications/utilities/mesh/manipulation/setSet/Allwmake
View File

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

4
applications/utilities/miscellaneous/foamHelp/Allwmake
View File

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

2
applications/utilities/postProcessing/dataConversion/foamToTecplot360/Allwmake
View File

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

3
applications/utilities/postProcessing/dataConversion/foamToVTK/Allwmake
View File

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

5
applications/utilities/postProcessing/graphics/PV3Readers/Allwmake
View File

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

5
applications/utilities/postProcessing/graphics/PV3Readers/PV3FoamReader/Allwmake
View File

@ -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
@ -16,6 +18,7 @@ then
cmake ../..
make
)
fi
fi
#------------------------------------------------------------------------------

5
applications/utilities/postProcessing/graphics/PV3Readers/PV3blockMeshReader/Allwmake
View File

@ -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
@ -16,6 +18,7 @@ then
cmake ../..
make
)
fi
fi
#------------------------------------------------------------------------------

5
applications/utilities/postProcessing/graphics/PVReaders/Allwmake
View File

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

5
applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/Allwmake
View File

@ -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
@ -16,6 +18,7 @@ then
cmake ../..
make
)
fi
fi
#------------------------------------------------------------------------------

5
applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/Allwmake
View File

@ -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
@ -16,6 +18,7 @@ then
cmake ../..
make
)
fi
fi
#------------------------------------------------------------------------------

1
applications/utilities/postProcessing/graphics/ensightFoamReader/Allwmake
View File

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

3
applications/utilities/preProcessing/wallFunctionTable/Allwmake
View File

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

3
src/Allwmake
View File

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

1
src/Pstream/Allwmake
View File

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

1
src/TurbulenceModels/Allwmake
View File

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

1
src/conversion/Allwmake
View File

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

1
src/dummyThirdParty/Allwmake vendored
View File

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

1
src/functionObjects/Allwmake
View File

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

1
src/fvAgglomerationMethods/Allwmake
View File

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

1
src/lagrangian/Allwmake
View File

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

1
src/lagrangian/molecularDynamics/Allwmake
View File

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

1
src/mesh/Allwmake
View File

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

1
src/parallel/Allwmake
View File

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

1
src/parallel/decompose/Allwclean
View File

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

1
src/parallel/decompose/Allwmake
View File

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

1
src/parallel/decompose/metisDecomp/Allwmake
View File

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

1
src/parallel/reconstruct/Allwmake
View File

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

1
src/regionModels/Allwmake
View File

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

1
src/renumber/Allwmake
View File

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

1
src/thermophysicalModels/Allwmake
View File

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

1
src/thermophysicalModels/properties/Allwmake
View File

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

1
src/transportModels/Allwmake
View File

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

9
wmake/scripts/AllwmakeParseArguments
View File

@ -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
;;
--)

12
wmake/wmake
View File

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