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

applications/utilities/miscellaneous/foamDebugSwitches/Make/options

 EXE_LIBS = \
-    -lautoMesh \
     -lbasicThermophysicalModels \
     -lchemistryModel \
     -lcombustionThermophysicalModels \
     -lcompressibleLESModels \
-    -lcompressibleRASModels \
     -ldecompositionMethods \
     -ldieselSpray \
     -ldynamicFvMesh \
@@ -17,6 +15,7 @@ EXE_LIBS = \
     -lfvMotionSolvers \
     -lincompressibleLESModels \
     -lincompressibleTransportModels \
+    -lcompressibleRASModels \
     -lincompressibleRASModels \
     -linterfaceProperties \
     -llagrangianIntermediate \
@@ -39,5 +38,5 @@ EXE_LIBS = \
     -lspecie \
     -lthermophysicalFunctions \
     -ltopoChangerFvMesh \
-    -ltriSurface
-
+    -ltriSurface \
+    -lautoMesh

src/autoMesh/Make/options

-/* include /home/pinky2/mattijs/pub/Delaunay/CGAL-3.1/make/makefile_i686_Linux-2.6.4-52-default_g++-3.4.3 */
-
 EXE_INC = \
-    /* -g -DFULLDEBUG -O0 $(CGAL_CXXFLAGS) */ \
     -I$(LIB_SRC)/decompositionAgglomeration/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(FOAM_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude
@@ -17,5 +14,4 @@ LIB_LIBS = \
     -llagrangian \
     -lmeshTools \
     -ledgeMesh \
-    -ltriSurface \
- /*   $(CGAL_LDFLAGS) */
+    -ltriSurface