From 74e1352cc2ced9fc2fd6f03753020fa4d9989925 Mon Sep 17 00:00:00 2001 From: Henry Weller Date: Thu, 25 Aug 2016 08:25:12 +0100 Subject: [PATCH] src/Pstream: Added Allwclean consistent with the Allwmake Patch contributed by Bruno Santos Resolves bug-report http://bugs.openfoam.org/view.php?id=2218 --- src/Pstream/Allwclean | 30 ++++++++++++++++++++++++++++++ src/Pstream/Allwmake | 4 +--- wmake/makefiles/general | 2 +- 3 files changed, 32 insertions(+), 4 deletions(-) create mode 100755 src/Pstream/Allwclean diff --git a/src/Pstream/Allwclean b/src/Pstream/Allwclean new file mode 100755 index 0000000000..df3ca316d4 --- /dev/null +++ b/src/Pstream/Allwclean @@ -0,0 +1,30 @@ +#!/bin/sh +cd ${0%/*} || exit 1 # Run from this directory + +# Define how an mpi-versioned library is created +# clean the qualified directory +wcleanMpiLib() +{ + set +x + for libName + do + ( + WM_OPTIONS="$WM_OPTIONS$WM_MPLIB" + wclean $libName + ) + done + set -x +} + +set -x +wclean dummy + +case "$WM_MPLIB" in +*MPI*) + set +x + wcleanMpiLib mpi + ;; +esac + + +#------------------------------------------------------------------------------ diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake index 617ae9ad34..a73b43cf03 100755 --- a/src/Pstream/Allwmake +++ b/src/Pstream/Allwmake @@ -5,11 +5,9 @@ cd ${0%/*} || exit 1 # Run from this directory . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments -# -# define how to create an mpi-versioned library of $targetType +# Define how to create an mpi-versioned library of $targetType # compile into qualified directory # use sentinel file to handle version changes -# wmakeMpiLib() { set +x diff --git a/wmake/makefiles/general b/wmake/makefiles/general index b9a4f99725..b7f49358a1 100644 --- a/wmake/makefiles/general +++ b/wmake/makefiles/general @@ -100,7 +100,7 @@ include $(GENERAL_RULES)/general #------------------------------------------------------------------------------ # Include PROJECT directory tree file and # source, object and dependency list files. -# These are constructed by MakefileFiles +# These are constructed by makefiles/files #------------------------------------------------------------------------------ include $(OBJECTS_DIR)/options