COMP: adjust compilation order with updated interdependencies

- Eg, with surface writers now in surfMesh, there are fewer libraries depending on conversion and sampling. COMP: regularize linkage ordering and avoid some implicit linkage (#1238)
2025-11-28 03:28:01 +00:00 · 2019-04-28 14:44:33 +02:00
parent 6c6f777bd5
commit 686e358982
265 changed files with 1253 additions and 1147 deletions
--- a/applications/utilities/mesh/advanced/PDRMesh/Make/options
+++ b/applications/utilities/mesh/advanced/PDRMesh/Make/options
@ -1,14 +1,14 @@
 EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
+    -lfiniteVolume \
+    -lfvOptions \
+    -lmeshTools \
+    -ldynamicMesh \
    -lturbulenceModels \
    -lcompressibleTurbulenceModels \
    -lcompressibleTransportModels \
-    -lfluidThermophysicalModels \
-    -lmeshTools \
-    -ldynamicMesh \
-    -lfiniteVolume \
-    -lfvOptions
+    -lfluidThermophysicalModels
--- a/applications/utilities/mesh/advanced/collapseEdges/Make/options
+++ b/applications/utilities/mesh/advanced/collapseEdges/Make/options
@ -1,9 +1,9 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
+    -lfiniteVolume \
    -lmeshTools \
-    -lfiniteVolume
+    -ldynamicMesh
--- a/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
+++ b/applications/utilities/mesh/advanced/combinePatchFaces/Make/options
@ -1,11 +1,12 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude


 EXE_LIBS = \
    -lfiniteVolume \
-    -lreconstruct \
-    -ldynamicMesh
+    -lmeshTools \
+    -ldynamicMesh \
+    -lreconstruct
--- a/applications/utilities/mesh/advanced/modifyMesh/Make/options
+++ b/applications/utilities/mesh/advanced/modifyMesh/Make/options
@ -1,10 +1,11 @@
 EXE_INC = \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
+    -lfiniteVolume \
    -lmeshTools \
-    -lreconstruct \
-    -ldynamicMesh
+    -ldynamicMesh \
+    -lreconstruct
--- a/applications/utilities/mesh/advanced/refineHexMesh/Make/options
+++ b/applications/utilities/mesh/advanced/refineHexMesh/Make/options
@ -1,10 +1,12 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
-    -lreconstruct \
+    -lfiniteVolume \
+    -lmeshTools \
    -ldynamicMesh \
+    -lreconstruct \
    -lgenericPatchFields
--- a/applications/utilities/mesh/advanced/refineWallLayer/Make/options
+++ b/applications/utilities/mesh/advanced/refineWallLayer/Make/options
@ -1,10 +1,11 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
    -ldynamicMesh \
-    -lreconstruct \
-    -lmeshTools
+    -lreconstruct
--- a/applications/utilities/mesh/advanced/removeFaces/Make/options
+++ b/applications/utilities/mesh/advanced/removeFaces/Make/options
@ -1,12 +1,12 @@
 EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude

 EXE_LIBS = \
+    -lfiniteVolume \
    -lmeshTools \
    -ldynamicMesh \
-    -lfiniteVolume \
    -lreconstruct \
    -lgenericPatchFields
--- a/applications/utilities/mesh/advanced/selectCells/Make/options
+++ b/applications/utilities/mesh/advanced/selectCells/Make/options
@ -5,6 +5,7 @@ EXE_INC = \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude

 EXE_LIBS = \
+    -lsurfMesh \
    -lmeshTools \
    -ldynamicMesh \
    -llagrangian
--- a/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
+++ b/applications/utilities/mesh/advanced/snappyRefineMesh/Make/options
@ -1,10 +1,11 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/lagrangian/basic/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
+    -lsurfMesh \
    -lmeshTools \
+    -ldynamicMesh \
    -llagrangian
--- a/applications/utilities/mesh/advanced/splitCells/Make/options
+++ b/applications/utilities/mesh/advanced/splitCells/Make/options
@ -3,5 +3,5 @@ EXE_INC = \
    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
-    -lmeshTools
+    -lmeshTools \
+    -ldynamicMesh
--- a/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeToRegionMesh/Make/options
@ -1,14 +1,14 @@
 EXE_INC = \
-    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude

 EXE_LIBS = \
-    -lsurfMesh \
    -lfiniteVolume \
+    -lsurfMesh \
    -lmeshTools \
    -ldynamicMesh \
    -lreconstruct \
--- a/applications/utilities/mesh/generation/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/Make/options
@ -1,14 +1,15 @@
 EXE_INC = \
+    -Iextrude2DMesh/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -Iextrude2DMesh/lnInclude \
    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude

 EXE_LIBS = \
    -lsurfMesh \
+    -lmeshTools \
    -ldynamicMesh \
    -lreconstruct \
    -lextrude2DMesh \
--- a/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
+++ b/applications/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/Make/options
@ -1,12 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude

 LIB_LIBS = \
+    -lfiniteVolume \
+    -lsurfMesh \
    -lmeshTools \
    -ldynamicMesh \
-    -lsurfMesh \
-    -lfiniteVolume
+    -lextrudeModel
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options
@ -16,7 +16,6 @@ EXE_INC =  \
    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
    -I../conformalVoronoiMesh/lnInclude
@ -26,7 +25,6 @@ EXE_LIBS =  \
    -lconformalVoronoiMesh \
    -lfiniteVolume \
    -lmeshTools \
-    -lsampling \
    -ldecompositionMethods \
    -L$(FOAM_LIBBIN)/dummy \
    -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
--- a/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyHexMesh/Make/options
@ -18,7 +18,6 @@ EXE_INC = \
    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
@ -28,7 +27,6 @@ EXE_LIBS = \
    ${CGAL_LIBS} \
    -lconformalVoronoiMesh \
    -lmeshTools \
-    -lsampling \
    -ldecompositionMethods \
    -ldecompose \
    -L$(FOAM_LIBBIN)/dummy \
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
@ -16,7 +16,6 @@ EXE_INC = \
    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/mesh/extrudeModel/lnInclude \
    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude
@ -28,7 +27,6 @@ EXE_LIBS = \
    -lcv2DMesh \
    -lconformalVoronoiMesh \
    -lmeshTools \
-    -lsampling \
    -ldynamicMesh \
    -ldecompositionMethods \
    -L$(FOAM_LIBBIN)/dummy \
--- a/applications/utilities/mesh/generation/snappyHexMesh/Make/options
+++ b/applications/utilities/mesh/generation/snappyHexMesh/Make/options
@ -3,23 +3,25 @@
 */

 EXE_INC = \
-    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/mesh/snappyHexMesh/lnInclude \
    -I$(LIB_SRC)/parallel/decompose/decompose/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
+    -lfileFormats \
+    -lsurfMesh \
+    -lmeshTools \
+    -ldynamicMesh \
    -ldecompositionMethods \
    -L$(FOAM_LIBBIN)/dummy \
    -lkahipDecomp -lmetisDecomp -lptscotchDecomp -lscotchDecomp \
-    -lmeshTools \
-    -ldynamicMesh \
    -ldecompose \
    -lreconstruct \
    -lsnappyHexMesh
--- a/applications/utilities/mesh/manipulation/autoPatch/Make/options
+++ b/applications/utilities/mesh/manipulation/autoPatch/Make/options
@ -3,5 +3,5 @@ EXE_INC = \
    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
-    -lmeshTools
+    -lmeshTools \
+    -ldynamicMesh
--- a/applications/utilities/mesh/manipulation/checkMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/checkMesh/Make/options
@ -1,12 +1,13 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/sampling/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \

 EXE_LIBS = \
+    -lfiniteVolume \
+    -lfileFormats \
+    -lsurfMesh \
    -lmeshTools \
-    -lsampling \
    -ldynamicMesh
--- a/applications/utilities/mesh/manipulation/createBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/createBaffles/Make/options
@ -1,13 +1,13 @@
 EXE_INC = \
    -IfaceSelection \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
-    -lmeshTools \
    -lfiniteVolume \
+    -lmeshTools \
+    -ldynamicMesh \
    -lreconstruct \
    -lgenericPatchFields
--- a/applications/utilities/mesh/manipulation/createPatch/Make/options
+++ b/applications/utilities/mesh/manipulation/createPatch/Make/options
@ -1,10 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
+    -lmeshTools \
    -ldynamicMesh \
-    -lreconstruct \
-    -lmeshTools
+    -lreconstruct
--- a/applications/utilities/mesh/manipulation/deformedGeom/Make/options
+++ b/applications/utilities/mesh/manipulation/deformedGeom/Make/options
@ -2,6 +2,4 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude

 EXE_LIBS = \
-    -lfiniteVolume \
-    \
-    -lmeshTools
+    -lfiniteVolume
--- a/applications/utilities/mesh/manipulation/flattenMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/flattenMesh/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
-    -lmeshTools
+    -lmeshTools \
+    -ldynamicMesh
--- a/applications/utilities/mesh/manipulation/insideCells/Make/options
+++ b/applications/utilities/mesh/manipulation/insideCells/Make/options
@ -3,4 +3,5 @@ EXE_INC = \
    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
+    -lsurfMesh \
    -lmeshTools
--- a/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
+++ b/applications/utilities/mesh/manipulation/mergeMeshes/Make/options
@ -1,9 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
+    -lmeshTools \
    -ldynamicMesh \
    -lreconstruct
--- a/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
+++ b/applications/utilities/mesh/manipulation/mergeOrSplitBaffles/Make/options
@ -1,10 +1,12 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
-    -lgenericPatchFields \
+    -lfiniteVolume \
+    -lmeshTools \
+    -ldynamicMesh \
    -lreconstruct \
-    -ldynamicMesh
+    -lgenericPatchFields
--- a/applications/utilities/mesh/manipulation/mirrorMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/mirrorMesh/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
-    -lfiniteVolume
+    -lfiniteVolume \
+    -ldynamicMesh
--- a/applications/utilities/mesh/manipulation/moveDynamicMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/moveDynamicMesh/Make/options
@ -1,10 +1,12 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicFvMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/fileFormats/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/dynamicFvMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicFvMesh \
+    -lfiniteVolume \
+    -lfileFormats \
    -lmeshTools \
-    -ldynamicMesh
+    -ldynamicMesh \
+    -ldynamicFvMesh
--- a/applications/utilities/mesh/manipulation/moveEngineMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/moveEngineMesh/Make/options
@ -1,10 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/engine/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/engine/lnInclude

 EXE_LIBS = \
-    -lengine \
-    -ldynamicMesh \
    -lfiniteVolume \
-    -lmeshTools
+    -lmeshTools \
+    -ldynamicMesh \
+    -lengine
--- a/applications/utilities/mesh/manipulation/moveMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/moveMesh/Make/options
@ -1,9 +1,9 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
-    -ldynamicMesh \
-    -lmeshTools
+    -lmeshTools \
+    -ldynamicMesh
--- a/applications/utilities/mesh/manipulation/objToVTK/Make/options
+++ b/applications/utilities/mesh/manipulation/objToVTK/Make/options
@ -1 +1,3 @@
-/* */
+EXE_INC =
+
+EXE_LIBS =
--- a/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/polyDualMesh/Make/options
@ -1,12 +1,12 @@
 EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
    -lfiniteVolume \
-    -lgenericPatchFields \
+    -lmeshTools \
    -ldynamicMesh \
    -lreconstruct \
-    -lmeshTools
+    -lgenericPatchFields
--- a/applications/utilities/mesh/manipulation/refineMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/refineMesh/Make/options
@ -1,7 +1,7 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
-    -lmeshTools
+    -lmeshTools \
+    -ldynamicMesh
--- a/applications/utilities/mesh/manipulation/renumberMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Make/options
@ -4,18 +4,18 @@

 EXE_INC = \
    ${COMP_FLAGS} \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/renumber/renumberMethods/lnInclude \
    -I$(LIB_SRC)/renumber/zoltanRenumber/lnInclude \
    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
+    -lfiniteVolume \
    -lmeshTools \
    -ldynamicMesh \
-    -lfiniteVolume \
    -lgenericPatchFields \
    -lrenumberMethods \
    -lreconstruct \
--- a/applications/utilities/mesh/manipulation/setsToZones/Make/options
+++ b/applications/utilities/mesh/manipulation/setsToZones/Make/options
@ -2,5 +2,4 @@ EXE_INC = \
    -I$(LIB_SRC)/meshTools/lnInclude

 EXE_LIBS = \
-    -lmeshTools \
-    -lsampling
+    -lmeshTools
--- a/applications/utilities/mesh/manipulation/singleCellMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/singleCellMesh/Make/options
@ -2,6 +2,5 @@ EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude

 EXE_LIBS = \
-    -lgenericPatchFields \
-    -lfiniteVolume
-
+    -lfiniteVolume \
+    -lgenericPatchFields
--- a/applications/utilities/mesh/manipulation/splitMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/splitMesh/Make/options
@ -1,10 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
+    -lmeshTools \
    -ldynamicMesh \
-    -lreconstruct \
-    -lmeshTools
+    -lreconstruct
--- a/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
+++ b/applications/utilities/mesh/manipulation/splitMeshRegions/Make/options
@ -1,10 +1,12 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
    -I$(LIB_SRC)/dynamicMesh/lnInclude \
-    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
-    -lreconstruct \
+    -lfiniteVolume \
+    -lmeshTools \
    -ldynamicMesh \
+    -lreconstruct \
    -lgenericPatchFields
--- a/applications/utilities/mesh/manipulation/stitchMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/stitchMesh/Make/options
@ -1,10 +1,10 @@
 EXE_INC = \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
+    -I$(LIB_SRC)/dynamicMesh/lnInclude

 EXE_LIBS = \
-    -ldynamicMesh \
-    -lmeshTools \
    -lfiniteVolume \
+    -lmeshTools \
+    -ldynamicMesh \
    -lgenericPatchFields
--- a/applications/utilities/mesh/manipulation/subsetMesh/Make/options
+++ b/applications/utilities/mesh/manipulation/subsetMesh/Make/options
@ -1,10 +1,12 @@
 EXE_INC = \
    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/dynamicMesh/lnInclude \
    -I$(LIB_SRC)/parallel/reconstruct/reconstruct/lnInclude

 EXE_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
    -ldynamicMesh \
    -lreconstruct \
    -lgenericPatchFields