Rationalized foamyHexMesh directory structure and build scripts

Resolves bug-report http://www.openfoam.org/mantisbt/view.php?id=1186

applications/utilities/mesh/generation/foamyHexMesh/Allwmake

@@ -1,14 +0,0 @@
-#!/bin/sh
-cd ${0%/*} || exit 1    # Run from this directory
-set -x
-
-if [ -n "$CGAL_ARCH_PATH" ]
-then
-    wmake libso conformalVoronoiMesh
-    wmake
-    #wmake foamyHexMeshBackgroundMesh
-    #(cd foamyHexMeshSurfaceSimplify && ./Allwmake)
-    #wmake cellSizeAndAlignmentGrid
-fi
-
-# ----------------------------------------------------------------- end-of-file

applications/utilities/mesh/generation/foamyMesh/Allwclean

@@ -2,9 +2,12 @@
 cd ${0%/*} || exit 1    # Run from this directory
 set -x
 
-wclean libso conformalVoronoiMesh
-wclean
+wclean conformalVoronoiMesh
+wclean conformalVoronoi2DMesh
+wclean foamyQuadMesh
+wclean foamyHexMesh
 wclean foamyHexMeshSurfaceSimplify
 wclean foamyHexMeshBackgroundMesh
+wclean cellSizeAndAlignmentGrid
 
 # ----------------------------------------------------------------- end-of-file

applications/utilities/mesh/generation/foamyMesh/Allwmake

@@ -0,0 +1,14 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # Run from this directory
+set -x
+
+wmake libso conformalVoronoiMesh
+wmake libso conformalVoronoi2DMesh
+wmake foamyQuadMesh
+wmake foamyHexMesh
+#wmake foamyHexMeshBackgroundMesh
+#(cd foamyHexMeshSurfaceSimplify && ./Allwmake)
+#wmake cellSizeAndAlignmentGrid
+
+
+# ----------------------------------------------------------------- end-of-file

applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/Make/options

@@ -21,8 +21,7 @@ EXE_INC =  \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
-    -I$(FOAM_UTILITIES)/mesh/generation/foamyHexMesh/conformalVoronoiMesh/lnInclude \
-    -I$(FOAM_UTILITIES)/mesh/generation/foamyHexMesh/vectorTools
+    -I../conformalVoronoiMesh/lnInclude
 
 EXE_LIBS =  \
     $(CGAL_LIBS) \

applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/Make/options

@@ -24,7 +24,6 @@ EXE_INC = \
     -I$(LIB_SRC)/sampling/lnInclude \
     -I$(LIB_SRC)/mesh/autoMesh/lnInclude \
     -IPrintTable \
-    -I../vectorTools \
     -I/usr/include
 
 LIB_LIBS = \