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

applications/utilities/mesh/conversion/ccm26ToFoam/ccm26ToFoam/Make/options

@@ -2,9 +2,10 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/other/libccmio \
-    -I$(LIB_SRC)/other/libccmio/lnInclude
+    -I$(LIB_SRC)/other/libccmio/libccmio/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
-    -lccmio
+    -lccmio \
+    -ladf