diff --git a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/options b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/options
index 03cad33b12173068b55973d31291ef5074f44fdf..42c94360af77c28cd6c3073f95a832106bc67b7d 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/MPPICInterFoam/CompressibleTwoPhaseMixtureTurbulenceModels/Make/options
@@ -1,15 +1,25 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude
+
+LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lincompressibleTransportModels \
+ -limmiscibleIncompressibleTwoPhaseMixture \
+ -linterfaceProperties \
+ -lturbulenceModels \
+ -lincompressibleTurbulenceModels \
+ -lcompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/MPPICInterFoam/Make/options b/applications/solvers/multiphase/MPPICInterFoam/Make/options
index 4cfc4eb15c396b839d3476fc7c59d60fe0e13c7e..4e877295c397f9fe62ae109d5449a19d94300750 100644
--- a/applications/solvers/multiphase/MPPICInterFoam/Make/options
+++ b/applications/solvers/multiphase/MPPICInterFoam/Make/options
@@ -36,6 +36,7 @@ EXE_LIBS = \
-lspecie \
-lincompressibleTransportModels \
-limmiscibleIncompressibleTwoPhaseMixture \
+ -linterfaceProperties \
-lturbulenceModels \
-lsampling \
-lregionModels \
diff --git a/applications/solvers/multiphase/cavitatingFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/Make/options
index 1fa237ac257676e7da1560227873e0e0b1265ed0..d12431dcd3d9ed003d1dad85f27992788060941e 100644
--- a/applications/solvers/multiphase/cavitatingFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/Make/options
@@ -1,10 +1,10 @@
EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude
@@ -13,6 +13,8 @@ EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lmeshTools \
+ -lincompressibleTransportModels \
+ -linterfaceProperties \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lbarotropicCompressibilityModel
diff --git a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
index e155941dc9dfb14103eedb35cf81b6665ac6fb35..fc06b222bd0c3a0d1265ee1753b219aa6670e8f5 100644
--- a/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
+++ b/applications/solvers/multiphase/cavitatingFoam/cavitatingDyMFoam/Make/options
@@ -2,10 +2,10 @@ EXE_INC = \
-I.. \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/barotropicCompressibilityModel/lnInclude \
@@ -16,6 +16,8 @@ EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lmeshTools \
+ -lincompressibleTransportModels \
+ -linterfaceProperties \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
-lbarotropicCompressibilityModel \
diff --git a/applications/solvers/multiphase/driftFluxFoam/Make/options b/applications/solvers/multiphase/driftFluxFoam/Make/options
index 5822f754aae1e568825f7b35a05fa98ff791e6f2..d54870c6889fd9949783fe7e978e40dac01f1acd 100644
--- a/applications/solvers/multiphase/driftFluxFoam/Make/options
+++ b/applications/solvers/multiphase/driftFluxFoam/Make/options
@@ -16,8 +16,10 @@ EXE_LIBS = \
-lfvOptions \
-lmeshTools \
-lsampling \
+ -lcompressibleTransportModels \
+ -lincompressibleTransportModels \
+ -ltwoPhaseMixture \
-ldriftFluxTransportModels \
-ldriftFluxRelativeVelocityModels \
- -lcompressibleTransportModels \
-lturbulenceModels \
-lcompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/options
index 01969d251bee749c1dc759c457872c9d25d797fb..1f33675d2985228e582835e99e4577e4d92f980d 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/CompressibleMultiPhaseTurbulenceModels/Make/options
@@ -1,11 +1,21 @@
EXE_INC = \
-I../phasesSystem/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseIncompressible/lnInclude
+
+LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lfluidThermophysicalModels \
+ -lspecie \
+ -lincompressibleTransportModels \
+ -lcompressibleTransportModels \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
index c96f1eac956238166e519769fb0ac4ac4e135fe5..a1ce378ad80e8773e274c56ad7f4e4dc7d887abb 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/Make/options
@@ -12,8 +12,7 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude
+ -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude
EXE_LIBS = \
-lfiniteVolume \
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options
index 165a136380ebe1f64ab36e7b6580e080e217b116..07ce7c685bdf01556375997c38ffa0c6cc57442e 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/laserDTRM/Make/options
@@ -1,11 +1,12 @@
EXE_INC = \
-I../phasesSystem/lnInclude \
- -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
- -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude
+ -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+ -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude
LIB_LIBS = \
- -lradiationModels \
+ -lfiniteVolume \
+ -lmeshTools \
-llagrangian \
- -lfiniteVolume
+ -lradiationModels
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/options
index 4737c8af11221b70f5e3bcabd3bfaf48af4cc3f0..0a7adfbd0409a5342a0f174b97b65cfd1c8386f0 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/massTransferModels/Make/options
@@ -1,7 +1,7 @@
EXE_INC = \
+ -I../phasesSystem/lnInclude \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I../phasesSystem/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -11,5 +11,8 @@ EXE_INC = \
LIB_LIBS = \
-lfiniteVolume \
+ -lmeshTools \
+ -lfluidThermophysicalModels \
+ -lreactionThermophysicalModels \
-lsolidThermo \
-lsolidSpecie
diff --git a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/options b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/options
index a7f8b3fe0b1806ba1a20cd43eb048e07306b3a9b..4a4a3493ddd8cd6f9bdaf52db77dea25332ca992 100644
--- a/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/options
+++ b/applications/solvers/multiphase/icoReactingMultiphaseInterFoam/phasesSystem/Make/options
@@ -9,14 +9,24 @@ EXE_INC = \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidThermo/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/solidSpecie/lnInclude \
- -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/transportModels/incompressible/lnInclude \
+ -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/combustionModels/lnInclude \
- -I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude
+ -I$(LIB_SRC)/combustionModels/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lmeshTools \
+ -lfluidThermophysicalModels \
+ -lreactionThermophysicalModels \
+ -lsolidThermo \
+ -lcompressibleTransportModels \
+ -lincompressibleTransportModels \
+ -linterfaceProperties \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels \
-lcombustionModels
diff --git a/applications/solvers/multiphase/interFoam/Make/options b/applications/solvers/multiphase/interFoam/Make/options
index c2ffc6980c71dd51a01be5fbaed91db205e23adc..a14b34a21fd2f5cc5138d9d54bfc8c06eca01aa1 100644
--- a/applications/solvers/multiphase/interFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/Make/options
@@ -5,9 +5,9 @@ EXE_INC = \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
-I$(LIB_SRC)/transportModels \
- -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/immiscibleIncompressibleTwoPhaseMixture/lnInclude
@@ -18,6 +18,8 @@ EXE_LIBS = \
-lmeshTools \
-lsampling \
-ldynamicFvMesh \
+ -lincompressibleTransportModels \
+ -linterfaceProperties \
-limmiscibleIncompressibleTwoPhaseMixture \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
diff --git a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options
index 1306fae1cbe3a77d69d54f3c12b6d66a00b54d4e..bfc9da810d19518cc0f5b0e775cdfab8b99b2995 100644
--- a/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options
+++ b/applications/solvers/multiphase/interFoam/overInterDyMFoam/Make/options
@@ -21,6 +21,8 @@ EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lsampling \
+ -lincompressibleTransportModels \
+ -linterfaceProperties \
-limmiscibleIncompressibleTwoPhaseMixture \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
diff --git a/applications/solvers/multiphase/interIsoFoam/Make/options b/applications/solvers/multiphase/interIsoFoam/Make/options
index 14db7f98ed14edb8ed68ff053506c31915420854..30a64e1962a9dd68f4a09377f58fafc9ffb6781c 100644
--- a/applications/solvers/multiphase/interIsoFoam/Make/options
+++ b/applications/solvers/multiphase/interIsoFoam/Make/options
@@ -3,8 +3,8 @@ EXE_INC = \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/dynamicFvMesh/lnInclude \
- -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
+ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
@@ -16,8 +16,10 @@ EXE_LIBS = \
-lfvOptions \
-lmeshTools \
-lsampling \
+ -ldynamicFvMesh \
+ -lincompressibleTransportModels \
+ -linterfaceProperties \
-limmiscibleIncompressibleTwoPhaseMixture \
-lturbulenceModels \
-lincompressibleTurbulenceModels \
- -ldynamicFvMesh \
-lwaveModels
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
index 65db644ba796f5afa0040d2f0b19833ad26417ca..b5d8007867932e038602299bdab9dbaa88cafc44 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialCompositionModels/Make/options
@@ -1,5 +1,7 @@
EXE_INC = \
-I../phaseSystems/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/thermophysicalProperties/lnInclude \
@@ -12,11 +14,10 @@ EXE_INC = \
-I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lfluidThermophysicalModels \
-lreactionThermophysicalModels \
-lspecie
diff --git a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
index 1e5f8f0aea9bcef1a5c8740a80c1941b44464674..85a68fefcf0eb612b389fbc32e29a23128a73351 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/interfacialModels/Make/options
@@ -1,15 +1,17 @@
EXE_INC = \
-I../phaseSystems/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/transportModel \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
- -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude
+ -I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude
LIB_LIBS = \
- -lcompressibleTransportModels \
+ -lfiniteVolume \
-lfluidThermophysicalModels \
- -lspecie
+ -lcompressibleTransportModels \
+ -lspecie \
+ -lreactingPhaseSystem
diff --git a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
index b93dd16af682da4bb1af2a88386e0566b97a6d9c..50ef9b5521ef2b4663bac8860cff12d8b17d9602 100644
--- a/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
+++ b/applications/solvers/multiphase/reactingEulerFoam/phaseSystems/Make/options
@@ -1,6 +1,9 @@
EXE_INC = \
-I../interfacialModels/lnInclude \
-I../interfacialCompositionModels/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
@@ -8,10 +11,14 @@ EXE_INC = \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/combustionModels/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
+ -I$(LIB_SRC)/combustionModels/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
+ -lfluidThermophysicalModels \
+ -lspecie \
+ -lreactionThermophysicalModels \
+ -lcompressibleTransportModels \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels \
-lcombustionModels
diff --git a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
index fc80a171e56d786da865f67065b5fe37fa9ccb4e..ded7a8f39a7d61ce0b0b11bd4c679329635a4311 100644
--- a/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
+++ b/applications/solvers/multiphase/twoLiquidMixingFoam/Make/options
@@ -3,10 +3,10 @@ EXE_INC = \
-I../VoF \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/transportModels \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/transportModels/interfaceProperties/lnInclude \
+ -I$(LIB_SRC)/transportModels/twoPhaseMixture/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/incompressible/lnInclude
@@ -14,6 +14,7 @@ EXE_LIBS = \
-lfiniteVolume \
-lfvOptions \
-lmeshTools \
- -ltwoPhaseMixture \
+ -lincompressibleTransportModels \
+ -linterfaceProperties \
-lturbulenceModels \
-lincompressibleTurbulenceModels
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
index 10c9111d823a8d387e1236fc820831153397d6f3..45b60207aab0a4c7ad547c5aade6ed1cbb971913 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/Make/options
@@ -2,8 +2,8 @@ EXE_INC = \
-I$(LIB_SRC)/finiteVolume/lnInclude \
-I$(LIB_SRC)/meshTools/lnInclude \
-I$(LIB_SRC)/sampling/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
diff --git a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options
index 7c0e7485a969810c42d75dcfe97022ac26199879..cd6eefd591d2cdfe3650dc0cc132a44e04b10e3c 100644
--- a/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options
+++ b/applications/solvers/multiphase/twoPhaseEulerFoam/twoPhaseSystem/Make/options
@@ -1,18 +1,21 @@
EXE_INC = \
-I../twoPhaseSystem \
-I../interfacialModels/lnInclude \
- -I$(LIB_SRC)/transportModels/compressible/lnInclude \
+ -I$(LIB_SRC)/finiteVolume/lnInclude \
+ -I$(LIB_SRC)/meshTools/lnInclude \
+ -I$(LIB_SRC)/sampling/lnInclude \
-I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+ -I$(LIB_SRC)/transportModels/compressible/lnInclude \
-I$(LIB_SRC)/transportModels/incompressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
-I$(LIB_SRC)/TurbulenceModels/phaseCompressible/lnInclude \
- -I$(LIB_SRC)/finiteVolume/lnInclude \
- -I$(LIB_SRC)/meshTools/lnInclude \
- -I$(LIB_SRC)/sampling/lnInclude
LIB_LIBS = \
+ -lfiniteVolume \
-lincompressibleTransportModels \
-lcompressibleTransportModels \
-lfluidThermophysicalModels \
- -lspecie
+ -lspecie \
+ -lturbulenceModels \
+ -lcompressibleTurbulenceModels
diff --git a/src/OpenFOAM/Make/options b/src/OpenFOAM/Make/options
index a91a22e5c0a92bf99d4280bd29fe8acd008ec74b..d9e7cdaf889421347961153743b7ca916d10e083 100644
--- a/src/OpenFOAM/Make/options
+++ b/src/OpenFOAM/Make/options
@@ -8,4 +8,8 @@ LIB_LIBS = \
$(FOAM_LIBBIN)/libOSspecific.o \
-lz
-LIB_LIBS += -L$(FOAM_LIBBIN)/dummy -lPstream
+ifeq ($(FOAM_LINK_DUMMY_PSTREAM),libo)
+ LIB_LIBS += $(FOAM_LIBBIN)/dummy/libPstream.o
+else
+ LIB_LIBS += -L$(FOAM_LIBBIN)/dummy -lPstream
+endif
diff --git a/src/parallel/decompose/kahipDecomp/Make/options b/src/parallel/decompose/kahipDecomp/Make/options
index 98706a61656b405511250f01b55f07d23c51cf79..bcdb4ea4dbc8e176bcedcad6aaf61769a6b83dcd 100644
--- a/src/parallel/decompose/kahipDecomp/Make/options
+++ b/src/parallel/decompose/kahipDecomp/Make/options
@@ -7,4 +7,5 @@ EXE_INC = \
* openmp link dependency.
*/
LIB_LIBS = \
+ -ldecompositionMethods \
-L$(KAHIP_LIB_DIR) $(LINK_OPENMP) -lkahip
diff --git a/src/parallel/decompose/metisDecomp/Make/options b/src/parallel/decompose/metisDecomp/Make/options
index c44099aa7ee9f7bedcc190b39e008ab178afec44..924cecca5224040afa4374466de1fb3f08bf9370 100644
--- a/src/parallel/decompose/metisDecomp/Make/options
+++ b/src/parallel/decompose/metisDecomp/Make/options
@@ -3,4 +3,5 @@ EXE_INC = \
-I../decompositionMethods/lnInclude
LIB_LIBS = \
+ -ldecompositionMethods \
-L$(METIS_LIB_DIR) -lmetis
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index 42e41f81462e205aec209775911409470676466a..98e715ac73f6c441477a89629ef5ba63e0cc3352 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -16,12 +16,18 @@ EXE_INC = \
* ptscotch 6 requires scotch linked in, but does not declare the dependency
*/
LIB_LIBS = \
+ -L$(FOAM_LIBBIN) -ldecompositionMethods \
-L$(PTSCOTCH_LIB_DIR) \
-L$(SCOTCH_LIB_DIR) \
- -lptscotch -lptscotcherrexit \
- -lscotch
+ -lscotch \
+ -lptscotch
+
+/* Combined into libptscotch for windows compile */
+ifneq ($(WM_OSTYPE),MSwindows)
+ LIB_LIBS += -lptscotcherrexit
+endif
/* May require librt, but scotch does not declare the dependency */
-ifeq ("$(EXT_SO)", ".so")
+ifeq ($(EXT_SO),.so)
LIB_LIBS += -lrt
endif
diff --git a/src/parallel/decompose/scotchDecomp/Make/options b/src/parallel/decompose/scotchDecomp/Make/options
index c605567ed60951c7b042093ec8b1820191a85333..1a4bd79edd48c69c7ffc14d21c22e651445da8e8 100644
--- a/src/parallel/decompose/scotchDecomp/Make/options
+++ b/src/parallel/decompose/scotchDecomp/Make/options
@@ -3,10 +3,16 @@ EXE_INC = \
-I../decompositionMethods/lnInclude
LIB_LIBS = \
+ -ldecompositionMethods \
-L$(SCOTCH_LIB_DIR) \
- -lscotch -lscotcherrexit
+ -lscotch
+
+/* Combined into libscotch for windows compile */
+ifneq ($(WM_OSTYPE),MSwindows)
+ LIB_LIBS += -lscotcherrexit
+endif
/* May require librt, but scotch does not declare the dependency */
-ifeq ("$(EXT_SO)", ".so")
+ifeq ($(EXT_SO),.so)
LIB_LIBS += -lrt
endif