Merge branch 'master' of /home/noisy2/OpenFOAM/OpenFOAM-dev

applications/utilities/mesh/conversion/Optional/Allwmake

@@ -0,0 +1,11 @@
+#!/bin/sh
+# Build optional components (eg, may depend on third-party libraries)
+set -x
+
+# if the library exists, assume there are headers too
+if [ -e $FOAM_LIBBIN/libccmio.so ]
+then
+   wmake ccm26ToFoam
+fi
+
+# end

applications/utilities/mesh/conversion/Optional/ccm26ToFoam/Allwmake

@@ -1,4 +0,0 @@
-#!/bin/sh
-set -x
-
-wmake ccm26ToFoam

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

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