COMP: simplify Make/options

executables/cartesian2DMesh/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

executables/cartesianMesh/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

executables/pMesh/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

executables/tetMesh/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

meshLibrary/Make/options

-ifeq (Gcc,$(findstring Gcc,$(WM_COMPILER)))
-    OMP_FLAGS = -DUSE_OMP -fopenmp
-else
-    OMP_FLAGS =
-endif
-
-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-        LIBS =
-    else
-        CFMESH_MACROS =
-        LIBS =
-    endif
-endif
-
 EXE_INC = \
-    $(OMP_FLAGS) $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    $(COMP_OPENMP) \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
-LIB_LIBS = $(LIBS)
+LIB_LIBS = -lmeshTools

testingInterfaces/testAnisotropicMeshing/Make/options

 EXE_INC = \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary \
-    -ledgeMesh \
-    -ltriSurface \
     -lmeshTools

testingInterfaces/testBndLayerRefinement/Make/options

 EXE_INC = \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary \
-    -ledgeMesh \
-    -ltriSurface \
     -lmeshTools

testingInterfaces/testBndLayerSmoothing/Make/options

 EXE_INC = \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary \
-    -ledgeMesh \
-    -ltriSurface \
     -lmeshTools

testingInterfaces/testDynList/Make/options

 EXE_INC = \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) -g -ggdb -DFULLDEBUG -O0 \
     -lmeshLibrary \
-    -ledgeMesh \
-    -ltriSurface \
     -lmeshTools

testingInterfaces/testEdgeExtractorFUN/Make/options

 EXE_INC = \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary \
-    -ledgeMesh \
-    -ltriSurface \
     -lmeshTools

utilities/FLMAToSurface/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/FMSToSurface/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/FMSToVTK/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/checkSurfaceMesh/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/copySurfaceParts/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/extrudeEdgesInto2DSurface/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/generateBoundaryLayers/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/importSurfaceAsSubset/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/improveMeshQuality/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/improveSymmetryPlanes/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/mergeSurfacePatches/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/meshToFPMA/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/patchesToSubsets/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary

utilities/preparePar/Make/options

-ifeq (OpenFOAM,$(findstring OpenFOAM,$(WM_PROJECT)))
-    ifeq (Int,$(findstring Int,$(WM_LABEL_OPTION)))
-        CFMESH_MACROS = -DNoSizeType
-    else
-        CFMESH_MACROS =
-    endif
-
-    ifeq (OpenFOAM-dev,$(findstring OpenFOAM-dev,$(WM_PROJECT_DIR)))
-        CFMESH_LIBS = -lmeshTools -ltriSurface -lfiniteVolume
-    else
-        CFMESH_LIBS = -lmeshTools -lfiniteVolume
-    endif
-endif
-
 EXE_INC = \
-    $(CFMESH_MACROS) \
-    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/fileFormats/lnInclude \
     -I$(LIB_SRC)/surfMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I../../meshLibrary/lnInclude
 
 EXE_LIBS = \
-    $(CFMESH_LIBS) \
+    -lfiniteVolume -lmeshTools \
     -L$(FOAM_USER_LIBBIN) \
     -lmeshLibrary