Merge branch 'master' of ssh://noisy/home/noisy3/OpenFOAM/OpenFOAM-dev

src/Allwmake

@@ -21,16 +21,16 @@ OSspecific/$WM_OSTYPE/Allwmake
 wmake libso OpenFOAM
 
 wmake libso fileFormats
+wmake libso triSurface
+wmake libso meshTools
 wmake libso edgeMesh
 wmake libso surfMesh
-wmake libso triSurface
 
 # Decomposition methods needed by dummyThirdParty
 parallel/decompose/AllwmakeLnInclude
 # dummyThirdParty (dummy metisDecomp, scotchDecomp etc) needed by e.g. meshTools
 dummyThirdParty/Allwmake
 
-wmake libso meshTools
 wmake libso lagrangian/basic
 wmake libso finiteVolume
 wmake libso genericPatchFields

src/edgeMesh/Make/options

 EXE_INC = \
     -I$(LIB_SRC)/fileFormats/lnInclude \
-    -I$(LIB_SRC)/triSurface/lnInclude \ 
-    -I$(LIB_SRC)/meshTools/lnInclude    
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 LIB_LIBS = \
     -ltriSurface \
-    -lmeshTools \ 
+    -lmeshTools \
     -lfileFormats