From a6e159ae5fd6d8e559b44426338e392008b83992 Mon Sep 17 00:00:00 2001
From: Henry Weller <http://openfoam.org>
Date: Sun, 10 Jun 2018 17:11:22 +0100
Subject: [PATCH] Make/options: Rationalized the layout of the EXE_INC
 statements

---
 applications/test/BinSum/Make/options                         | 2 --
 applications/test/DynamicField/Make/options                   | 2 --
 applications/test/DynamicList/Make/options                    | 2 --
 applications/test/Field/Make/options                          | 2 --
 applications/test/HashSet/Make/options                        | 2 --
 applications/test/HashTable2/Make/options                     | 2 --
 applications/test/HashTable3/Make/options                     | 2 --
 applications/test/IOField/Make/options                        | 2 --
 applications/test/IStringStream/Make/options                  | 2 --
 applications/test/IndirectList/Make/options                   | 2 --
 applications/test/Map/Make/options                            | 2 --
 applications/test/Matrix/Make/options                         | 2 --
 applications/test/NamedEnum/Make/options                      | 2 --
 applications/test/ODE/Make/options                            | 4 +++-
 applications/test/OStringStream/Make/options                  | 2 --
 applications/test/POSIX/Make/options                          | 2 --
 applications/test/UniformField/Make/options                   | 2 --
 applications/test/alloc/Make/options                          | 2 --
 applications/test/dimensionedType/Make/options                | 2 --
 applications/test/dynamicIndexedOctree/Make/options           | 3 ++-
 applications/test/error/Make/options                          | 2 --
 applications/test/findTimes/Make/options                      | 2 --
 applications/test/foamVersion/Make/options                    | 2 --
 applications/test/mkdir/Make/options                          | 2 --
 applications/test/mvBak/Make/options                          | 2 --
 applications/test/pTraits/Make/options                        | 2 --
 applications/test/primitivePatch/Make/options                 | 2 --
 applications/test/simpleMatrix/Make/options                   | 2 --
 applications/test/sizeof/Make/options                         | 2 --
 applications/test/sort/Make/options                           | 2 --
 applications/test/string/Make/options                         | 2 --
 applications/test/stringList/Make/options                     | 2 --
 applications/test/vectorTools/Make/options                    | 3 ++-
 applications/utilities/mesh/conversion/mshToFoam/Make/options | 2 --
 .../utilities/thermophysical/equilibriumCO/Make/options       | 4 +++-
 src/OpenFOAM/Make/options                                     | 3 ++-
 36 files changed, 12 insertions(+), 67 deletions(-)

diff --git a/applications/test/BinSum/Make/options b/applications/test/BinSum/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/BinSum/Make/options
+++ b/applications/test/BinSum/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/DynamicField/Make/options b/applications/test/DynamicField/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/DynamicField/Make/options
+++ b/applications/test/DynamicField/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/DynamicList/Make/options b/applications/test/DynamicList/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/DynamicList/Make/options
+++ b/applications/test/DynamicList/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/Field/Make/options b/applications/test/Field/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/Field/Make/options
+++ b/applications/test/Field/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/HashSet/Make/options b/applications/test/HashSet/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/HashSet/Make/options
+++ b/applications/test/HashSet/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/HashTable2/Make/options b/applications/test/HashTable2/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/HashTable2/Make/options
+++ b/applications/test/HashTable2/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/HashTable3/Make/options b/applications/test/HashTable3/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/HashTable3/Make/options
+++ b/applications/test/HashTable3/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/IOField/Make/options b/applications/test/IOField/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/IOField/Make/options
+++ b/applications/test/IOField/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/IStringStream/Make/options b/applications/test/IStringStream/Make/options
index 4e772fdf9..e69de29bb 100644
--- a/applications/test/IStringStream/Make/options
+++ b/applications/test/IStringStream/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/IndirectList/Make/options b/applications/test/IndirectList/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/IndirectList/Make/options
+++ b/applications/test/IndirectList/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/Map/Make/options b/applications/test/Map/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/Map/Make/options
+++ b/applications/test/Map/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/Matrix/Make/options b/applications/test/Matrix/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/Matrix/Make/options
+++ b/applications/test/Matrix/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/NamedEnum/Make/options b/applications/test/NamedEnum/Make/options
index 4e772fdf9..e69de29bb 100644
--- a/applications/test/NamedEnum/Make/options
+++ b/applications/test/NamedEnum/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/ODE/Make/options b/applications/test/ODE/Make/options
index 6a97b686a..d6b4edef2 100644
--- a/applications/test/ODE/Make/options
+++ b/applications/test/ODE/Make/options
@@ -1,2 +1,4 @@
-EXE_INC = -I$(LIB_SRC)/ODE/lnInclude
+EXE_INC = \
+    -I$(LIB_SRC)/ODE/lnInclude
+
 EXE_LIBS = -lODE
diff --git a/applications/test/OStringStream/Make/options b/applications/test/OStringStream/Make/options
index 4e772fdf9..e69de29bb 100644
--- a/applications/test/OStringStream/Make/options
+++ b/applications/test/OStringStream/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/POSIX/Make/options b/applications/test/POSIX/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/POSIX/Make/options
+++ b/applications/test/POSIX/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/UniformField/Make/options b/applications/test/UniformField/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/UniformField/Make/options
+++ b/applications/test/UniformField/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/alloc/Make/options b/applications/test/alloc/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/alloc/Make/options
+++ b/applications/test/alloc/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/dimensionedType/Make/options b/applications/test/dimensionedType/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/dimensionedType/Make/options
+++ b/applications/test/dimensionedType/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/dynamicIndexedOctree/Make/options b/applications/test/dynamicIndexedOctree/Make/options
index e2c7c2d10..afde70671 100644
--- a/applications/test/dynamicIndexedOctree/Make/options
+++ b/applications/test/dynamicIndexedOctree/Make/options
@@ -1,3 +1,4 @@
-EXE_INC = -I$(FOAM_SRC)/meshTools/lnInclude
+EXE_INC = \
+    -I$(FOAM_SRC)/meshTools/lnInclude
 
 EXE_LIBS = -lmeshTools
diff --git a/applications/test/error/Make/options b/applications/test/error/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/error/Make/options
+++ b/applications/test/error/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/findTimes/Make/options b/applications/test/findTimes/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/findTimes/Make/options
+++ b/applications/test/findTimes/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/foamVersion/Make/options b/applications/test/foamVersion/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/foamVersion/Make/options
+++ b/applications/test/foamVersion/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/mkdir/Make/options b/applications/test/mkdir/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/mkdir/Make/options
+++ b/applications/test/mkdir/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/mvBak/Make/options b/applications/test/mvBak/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/mvBak/Make/options
+++ b/applications/test/mvBak/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/pTraits/Make/options b/applications/test/pTraits/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/pTraits/Make/options
+++ b/applications/test/pTraits/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/primitivePatch/Make/options b/applications/test/primitivePatch/Make/options
index 4e772fdf9..e69de29bb 100644
--- a/applications/test/primitivePatch/Make/options
+++ b/applications/test/primitivePatch/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/simpleMatrix/Make/options b/applications/test/simpleMatrix/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/simpleMatrix/Make/options
+++ b/applications/test/simpleMatrix/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/sizeof/Make/options b/applications/test/sizeof/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/sizeof/Make/options
+++ b/applications/test/sizeof/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/sort/Make/options b/applications/test/sort/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/sort/Make/options
+++ b/applications/test/sort/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/string/Make/options b/applications/test/string/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/string/Make/options
+++ b/applications/test/string/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/stringList/Make/options b/applications/test/stringList/Make/options
index 6a9e9810b..e69de29bb 100644
--- a/applications/test/stringList/Make/options
+++ b/applications/test/stringList/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/vectorTools/Make/options b/applications/test/vectorTools/Make/options
index f695987c0..4fd76effe 100644
--- a/applications/test/vectorTools/Make/options
+++ b/applications/test/vectorTools/Make/options
@@ -1 +1,2 @@
-EXE_INC = -I$(FOAM_APP)/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools
+EXE_INC = \
+    -I$(FOAM_APP)/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools
diff --git a/applications/utilities/mesh/conversion/mshToFoam/Make/options b/applications/utilities/mesh/conversion/mshToFoam/Make/options
index 4e772fdf9..e69de29bb 100644
--- a/applications/utilities/mesh/conversion/mshToFoam/Make/options
+++ b/applications/utilities/mesh/conversion/mshToFoam/Make/options
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/utilities/thermophysical/equilibriumCO/Make/options b/applications/utilities/thermophysical/equilibriumCO/Make/options
index 6be7b16bd..73aefe4bb 100644
--- a/applications/utilities/thermophysical/equilibriumCO/Make/options
+++ b/applications/utilities/thermophysical/equilibriumCO/Make/options
@@ -1,2 +1,4 @@
-EXE_INC = -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
+EXE_INC = \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
+
 EXE_LIBS = -lspecie
diff --git a/src/OpenFOAM/Make/options b/src/OpenFOAM/Make/options
index b1cc1a2d1..84591cccb 100644
--- a/src/OpenFOAM/Make/options
+++ b/src/OpenFOAM/Make/options
@@ -1,4 +1,5 @@
-EXE_INC = -I$(OBJECTS_DIR)
+EXE_INC = \
+    -I$(OBJECTS_DIR)
 
 LIB_LIBS = \
     $(FOAM_LIBBIN)/libOSspecific.o \