From 6116efd1303c714582336764dca31a47e0838f0a Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Fri, 3 Jun 2005 17:32:30 +0000
Subject: [PATCH] removed unused stuff + handle SURF_DISCRETE in
 MeshDiscreteSurface

---
 Common/Makefile          |   97 +-
 DataStr/Makefile         |    8 +-
 Fltk/Makefile            |  163 +-
 Geo/Makefile             |  103 +-
 Graphics/Makefile        |  222 +-
 MathEval/Makefile        |    8 +-
 Mesh/DiscreteSurface.cpp |   41 +-
 Mesh/DiscreteSurface.h   |   66 -
 Mesh/Makefile            |  501 ++--
 Mesh/Mesh.h              |    1 -
 Netgen/Makefile          | 6028 +++++++++++++++++++++++---------------
 Numeric/Makefile         |   15 +-
 Parallel/Makefile        |    3 +-
 Parser/Makefile          |   65 +-
 Plugin/Makefile          |  275 +-
 15 files changed, 4659 insertions(+), 2937 deletions(-)
 delete mode 100644 Mesh/DiscreteSurface.h

diff --git a/Common/Makefile b/Common/Makefile
index aea51f29d4..612c4ed3d5 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.75 2005-03-11 08:56:37 geuzaine Exp $
+# $Id: Makefile,v 1.76 2005-06-03 17:32:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -62,59 +62,90 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Common//"
 Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Context.h DefaultOptions.h Options.h \
-  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h Views.h \
-  ColorTable.h GmshMatrix.h AdaptiveViews.h Trackball.h
+  ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Context.h \
+  DefaultOptions.h Options.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Views.h ColorTable.h \
+  VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h Trackball.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 AdaptiveViews.o: AdaptiveViews.cpp AdaptiveViews.h ../DataStr/List.h \
   GmshMatrix.h ../Plugin/Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 Views.o: Views.cpp Gmsh.h Message.h ../DataStr/Malloc.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Views.h ColorTable.h VertexArray.h SmoothNormals.h \
-  GmshMatrix.h AdaptiveViews.h Context.h Options.h
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../Numeric/Numeric.h Views.h ColorTable.h \
+  VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h Context.h \
+  Options.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 Options.o: Options.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
   ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h Gmsh.h ../DataStr/Malloc.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h GmshUI.h ../Geo/Geo.h \
-  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  ../Graphics/Draw.h Context.h ../Fltk/Solvers.h ../Fltk/GUI.h \
-  ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Gmsh.h Message.h \
+  ../DataStr/Malloc.h ../DataStr/Tree.h ../DataStr/avl.h \
+  ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h GmshUI.h \
+  ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+  ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+  ../Mesh/Matrix.h ../Graphics/Draw.h Context.h Options.h \
+  ../Fltk/Solvers.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
+  ../Fltk/Colorbar_Window.h ../Common/GmshUI.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 CommandLine.o: CommandLine.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  GmshUI.h GmshVersion.h CommandLine.h ../Numeric/Numeric.h Context.h \
-  Options.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
-  ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h \
-  ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Views.h ColorTable.h GmshMatrix.h AdaptiveViews.h \
+  ../DataStr/List.h ../DataStr/Tree.h GmshUI.h GmshVersion.h \
+  CommandLine.h ../Numeric/Numeric.h Context.h Options.h ../Geo/Geo.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Views.h ColorTable.h \
+  VertexArray.h SmoothNormals.h GmshMatrix.h AdaptiveViews.h \
   ../Parser/OpenFile.h ../Parser/Parser.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 Timer.o: Timer.cpp
+# 1 "/Users/geuzaine/.gmsh/Common//"
 ColorTable.o: ColorTable.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ColorTable.h Context.h ../Numeric/Numeric.h
+  ../DataStr/List.h ../DataStr/Tree.h ColorTable.h Context.h \
+  ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 Visibility.o: Visibility.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
-  ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h \
-  ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Parser/Parser.h Visibility.h
+  ../DataStr/List.h ../DataStr/Tree.h ../Geo/Geo.h ../Geo/CAD.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h ../Parser/Parser.h Visibility.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 Trackball.o: Trackball.cpp Trackball.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 VertexArray.o: VertexArray.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  VertexArray.h Context.h ../Numeric/Numeric.h
+  ../DataStr/List.h ../DataStr/Tree.h VertexArray.h Context.h \
+  ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 SmoothNormals.o: SmoothNormals.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h SmoothNormals.h
+  ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h \
+  SmoothNormals.h
+# 1 "/Users/geuzaine/.gmsh/Common//"
 License.o: License.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
-  ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h
+  ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+  ../DataStr/List.h ../DataStr/Tree.h
diff --git a/DataStr/Makefile b/DataStr/Makefile
index 9d718fec11..c036dd37c7 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.24 2005-01-01 19:35:27 geuzaine Exp $
+# $Id: Makefile,v 1.25 2005-06-03 17:32:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -55,9 +55,15 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/DataStr//"
 List.o: List.cpp Malloc.h List.h ../Common/Message.h SafeIO.h
+# 1 "/Users/geuzaine/.gmsh/DataStr//"
 Malloc.o: Malloc.cpp Malloc.h ../Common/Message.h
+# 1 "/Users/geuzaine/.gmsh/DataStr//"
 SafeIO.o: SafeIO.cpp SafeIO.h ../Common/Message.h
+# 1 "/Users/geuzaine/.gmsh/DataStr//"
 Tree.o: Tree.cpp Malloc.h Tree.h avl.h ../Common/Message.h
+# 1 "/Users/geuzaine/.gmsh/DataStr//"
 avl.o: avl.cpp avl.h Malloc.h
+# 1 "/Users/geuzaine/.gmsh/DataStr//"
 Tools.o: Tools.cpp Tools.h List.h Tree.h avl.h
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 2988115ce3..1d832cfd4b 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.69 2005-01-16 20:41:38 geuzaine Exp $
+# $Id: Makefile,v 1.70 2005-06-03 17:32:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -62,100 +62,141 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Main.o: Main.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
   ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Gmsh.h ../DataStr/Malloc.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Gmsh.h \
+  ../Common/Message.h ../DataStr/Malloc.h ../DataStr/Tree.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
   ../Common/GmshUI.h ../Common/GmshVersion.h ../Geo/Geo.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Mesh/Metric.h ../Mesh/Matrix.h ../Graphics/Draw.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Graphics/Draw.h \
   ../Common/Context.h ../Parser/Parser.h GUI.h Opengl_Window.h \
   Colorbar_Window.h ../Parser/OpenFile.h ../Common/CommandLine.h \
   ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
-  ../Common/GmshVersion.h ../Common/Context.h ../Common/Options.h GUI.h \
-  Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  Colorbar_Window.h ../Common/ColorTable.h GUI_Extras.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Common/GmshVersion.h ../Common/Context.h \
+  ../Common/Options.h GUI.h Opengl_Window.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
+  ../Common/ColorTable.h GUI_Extras.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
   ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Gmsh.h ../DataStr/Malloc.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Gmsh.h \
+  ../Common/Message.h ../DataStr/Malloc.h ../DataStr/Tree.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
   ../Common/GmshUI.h ../Numeric/Numeric.h ../Common/GmshVersion.h \
   ../Common/Context.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Mesh/Metric.h ../Mesh/Matrix.h ../Graphics/Draw.h GUI.h \
-  Opengl_Window.h Colorbar_Window.h Callbacks.h Bitmaps.h Win32Icon.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h ../Graphics/Draw.h GUI.h Opengl_Window.h \
+  Colorbar_Window.h Callbacks.h Bitmaps.h Win32Icon.h \
   ../Parser/OpenFile.h ../Common/CommandLine.h Solvers.h \
   Shortcut_Window.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 GUI_Extras.o: GUI_Extras.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h File_Picker.h Shortcut_Window.h \
-  ../Graphics/CreateFile.h ../Common/Options.h ../Common/Context.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  File_Picker.h Shortcut_Window.h ../Graphics/CreateFile.h \
+  ../Common/Options.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  ../Geo/ExtractContour.h ../Graphics/Draw.h ../Common/Views.h \
-  ../Common/ColorTable.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
-  ../Common/Timer.h ../Graphics/CreateFile.h ../Parser/OpenFile.h \
-  ../Common/CommandLine.h ../Common/Context.h ../Common/Options.h GUI.h \
-  Opengl_Window.h Colorbar_Window.h GUI_Extras.h Callbacks.h \
-  ../Plugin/Plugin.h ../Plugin/PluginManager.h ../Common/Visibility.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h ../Geo/ExtractContour.h ../Graphics/Draw.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Timer.h \
+  ../Graphics/CreateFile.h ../Parser/OpenFile.h ../Common/CommandLine.h \
+  ../Common/Context.h ../Common/Options.h GUI.h Opengl_Window.h \
+  Colorbar_Window.h GUI_Extras.h Callbacks.h ../Plugin/Plugin.h \
+  ../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Visibility.h \
   ../Geo/MinMax.h ../Numeric/Numeric.h Solvers.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
-  ../Numeric/Numeric.h ../Common/Context.h ../Geo/Geo.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Numeric/Numeric.h ../Common/Context.h \
+  ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Graphics/Draw.h ../Common/Views.h \
-  ../Common/ColorTable.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
   GUI.h Opengl_Window.h Colorbar_Window.h ../Graphics/gl2ps.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h \
-  ../Common/GmshUI.h ../Common/Context.h ../Geo/Geo.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Common/GmshUI.h ../Common/Context.h \
+  ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Graphics/Draw.h ../Common/Views.h \
-  ../Common/ColorTable.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
   GUI.h Opengl_Window.h Colorbar_Window.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
   ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Common/GmshUI.h GUI.h Opengl_Window.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Colorbar_Window.h ../Common/ColorTable.h \
-  ../Common/Context.h
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../Common/GmshUI.h GUI.h Opengl_Window.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Colorbar_Window.h \
+  ../Common/ColorTable.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Fltk//"
 Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h GmshServer.h ../Parser/OpenFile.h \
-  Solvers.h ../Common/GmshUI.h GUI.h Opengl_Window.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  GmshServer.h ../Parser/OpenFile.h Solvers.h ../Common/GmshUI.h GUI.h \
+  Opengl_Window.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Colorbar_Window.h ../Common/ColorTable.h \
-  ../Graphics/Draw.h ../Common/Views.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Context.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  Colorbar_Window.h ../Common/ColorTable.h ../Graphics/Draw.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h
diff --git a/Geo/Makefile b/Geo/Makefile
index a12055545f..16a31bfb6d 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.62 2005-05-15 01:44:25 geuzaine Exp $
+# $Id: Makefile,v 1.63 2005-06-03 17:32:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -58,59 +58,90 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 CAD.o: CAD.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
-  ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h \
-  ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Mesh/Interpolation.h ../Mesh/Create.h CAD.h \
+  ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Geo.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+  ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h ExtrudeParams.h \
   ../Common/Visibility.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 MinMax.o: MinMax.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h \
-  ../Mesh/Vertex.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Mesh/Vertex.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 ExtrudeParams.o: ExtrudeParams.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Geo.h CAD.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Geo.h CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ExtrudeParams.h
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 Geo.o: Geo.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Geo.h CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
-  ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h \
-  ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Parser/Parser.h ../Common/Context.h
+  ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Geo.h CAD.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ExtrudeParams.h \
+  ../Parser/Parser.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 GeoUtils.o: GeoUtils.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Geo.h CAD.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Geo.h CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Numeric/Numeric.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ExtrudeParams.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 StepGeomDatabase.o: StepGeomDatabase.cpp ../Common/Gmsh.h \
   ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Geo.h GeoUtils.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
-  ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h \
-  ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Mesh/Nurbs.h CAD.h StepGeomDatabase.h \
-  ../Mesh/Create.h ../Common/Context.h
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../Numeric/Numeric.h Geo.h GeoUtils.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Mesh/Nurbs.h \
+  ../Mesh/Vertex.h ../Mesh/Mesh.h CAD.h ExtrudeParams.h \
+  StepGeomDatabase.h ../Mesh/Create.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 ExtractContour.o: ExtractContour.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Geo.h GeoUtils.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Geo.h GeoUtils.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h CAD.h ../Numeric/Numeric.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  CAD.h ExtrudeParams.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Geo//"
 Print_Geo.o: Print_Geo.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Geo.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h CAD.h ../Numeric/Numeric.h ../Common/Context.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  CAD.h ExtrudeParams.h ../Numeric/Numeric.h ../Common/Context.h
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 230c90e4eb..06644cc247 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.70 2005-05-15 01:44:26 geuzaine Exp $
+# $Id: Makefile,v 1.71 2005-06-03 17:32:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -68,119 +68,185 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Common/GmshUI.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h ../Geo/Geo.h \
+  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h \
-  ../Geo/MinMax.h ../Numeric/Numeric.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Common/Context.h ../Geo/MinMax.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Common/GmshUI.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h ../Geo/Geo.h \
+  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h \
-  ../Geo/MinMax.h gl2ps.h ../Numeric/Numeric.h
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Common/Context.h ../Geo/MinMax.h gl2ps.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Geom.o: Geom.cpp ../Mesh/BDS.h ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
-  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Mesh/Utils.h Draw.h ../Common/Views.h \
-  ../Common/ColorTable.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
-  ../Common/Context.h ../Mesh/Interpolation.h ../Plugin/Plugin.h \
-  ../Common/Options.h ../Plugin/PluginManager.h gl2ps.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Utils.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+  Draw.h ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+  ../Mesh/Interpolation.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+  ../Plugin/Plugin.h ../Common/Options.h ../Plugin/PluginManager.h \
+  ../Plugin/Plugin.h gl2ps.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Common/GmshUI.h ../Numeric/Numeric.h ../Geo/Geo.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h \
+  ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Draw.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
   gl2ps.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 PostElement.o: PostElement.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
-  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h Draw.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h Iso.h ../Common/Context.h \
-  ../Numeric/Numeric.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Draw.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h Iso.h \
+  ../Common/Context.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Common/GmshUI.h ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
-  ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h \
-  ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h \
+  ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h ../Geo/Geo.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Draw.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
   ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Entity.o: Entity.cpp ../Mesh/Mesh.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
-  ../DataStr/Tools.h ../Common/GmshUI.h ../Numeric/Numeric.h Draw.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Context.h gl2ps.h
+  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Common/Gmsh.h \
+  ../Common/Message.h ../DataStr/Malloc.h ../DataStr/Tools.h \
+  ../DataStr/List.h ../DataStr/Tree.h ../Common/GmshUI.h \
+  ../Numeric/Numeric.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Common/Context.h gl2ps.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 ReadImg.o: ReadImg.cpp ReadImg.h ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
-  ../Numeric/Numeric.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h Draw.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Context.h gl2ps.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Numeric/Numeric.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Draw.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+  gl2ps.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 Graph2D.o: Graph2D.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
-  ../Common/Context.h ../Numeric/Numeric.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h gl2ps.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Common/Context.h ../Numeric/Numeric.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Draw.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h gl2ps.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Parser/OpenFile.h Draw.h ../Common/Views.h \
-  ../Common/ColorTable.h ../Common/GmshMatrix.h ../Common/AdaptiveViews.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Parser/OpenFile.h Draw.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
   ../Common/Context.h ../Common/Options.h gl2ps.h gl2gif.h gl2jpeg.h \
   gl2png.h gl2ppm.h gl2yuv.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 gl2ps.o: gl2ps.cpp gl2ps.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 gl2gif.o: gl2gif.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2gif.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h gl2gif.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 gl2jpeg.o: gl2jpeg.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 gl2png.o: gl2png.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 gl2ppm.o: gl2ppm.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h
+# 1 "/Users/geuzaine/.gmsh/Graphics//"
 gl2yuv.o: gl2yuv.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Common/GmshUI.h
diff --git a/MathEval/Makefile b/MathEval/Makefile
index 3ce9fbd966..5e3c7850dc 100644
--- a/MathEval/Makefile
+++ b/MathEval/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2005-01-01 19:35:30 geuzaine Exp $
+# $Id: Makefile,v 1.4 2005-06-03 17:32:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -62,12 +62,18 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/MathEval//"
 matheval.o: matheval.cpp common.h ../DataStr/Malloc.h matheval.h node.h \
   symbol_table.h
+# 1 "/Users/geuzaine/.gmsh/MathEval//"
 node.o: node.cpp common.h ../DataStr/Malloc.h node.h symbol_table.h
+# 1 "/Users/geuzaine/.gmsh/MathEval//"
 scanner.o: scanner.cpp common.h ../DataStr/Malloc.h node.h symbol_table.h \
   parser.h
+# 1 "/Users/geuzaine/.gmsh/MathEval//"
 parser.o: parser.cpp common.h ../DataStr/Malloc.h node.h symbol_table.h
+# 1 "/Users/geuzaine/.gmsh/MathEval//"
 symbol_table.o: symbol_table.cpp common.h ../DataStr/Malloc.h \
   symbol_table.h xmath.h
+# 1 "/Users/geuzaine/.gmsh/MathEval//"
 xmath.o: xmath.cpp xmath.h
diff --git a/Mesh/DiscreteSurface.cpp b/Mesh/DiscreteSurface.cpp
index 1b45440737..80f2468eab 100644
--- a/Mesh/DiscreteSurface.cpp
+++ b/Mesh/DiscreteSurface.cpp
@@ -1,4 +1,4 @@
-// $Id: DiscreteSurface.cpp,v 1.14 2005-05-13 05:09:08 geuzaine Exp $
+// $Id: DiscreteSurface.cpp,v 1.15 2005-06-03 17:32:29 geuzaine Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -22,7 +22,6 @@
 #include "Gmsh.h"
 #include "Numeric.h"
 #include "Mesh.h"
-#include "DiscreteSurface.h"
 #include "CAD.h"
 #include "Geo.h"
 #include "Create.h"
@@ -93,30 +92,34 @@ void BDS_To_Mesh(Mesh *m)
 
 int MeshDiscreteSurface(Surface *s)
 {
-    // s->bds is the discrete surface that 
-    // defines the geometry
-    if(s->bds){
-	if (!THEM->bds_mesh)
-	{
-	    THEM->bds_mesh = new BDS_Mesh (*(THEM->bds));
-	    int iter = 0;
-	    while (iter < 20 && THEM->bds_mesh -> adapt_mesh ( CTX.mesh.lc_factor * THEM->bds->LC, true,THEM->bds))
-	    {
-		printf("iter %d done\n",iter);
-		iter ++;
-	    }
-	    THEM->bds_mesh->save_gmsh_format ( "3.msh" );
-	}
-	return 1;
+  if(s->bds){
+    // s->bds is the discrete surface that defines the geometry
+    if(!THEM->bds_mesh){
+      THEM->bds_mesh = new BDS_Mesh (*(THEM->bds));
+      int iter = 0;
+      while(iter < 20 && THEM->bds_mesh->adapt_mesh(CTX.mesh.lc_factor * THEM->bds->LC, 
+						    true, THEM->bds)){
+	printf("iter %d done\n",iter);
+	iter ++;
+      }
+      THEM->bds_mesh->save_gmsh_format ( "3.msh" );
     }
+    return 1;
+  }
+  else if(s->Typ == MSH_SURF_DISCRETE){
+    // nothing to do: we suppose that the surface is represented by
+    // a mesh that will not be modified
+    return 1;
+  }
+  else
     return 0;
 }
 
 int MeshDiscreteCurve(Curve *c)
 {
   if(c->Typ == MSH_SEGM_DISCRETE){
-    // nothing else to do: we assume that the elements have alreay
-    // been created
+    // nothing else to do: we assume that the curve is represented by
+    // a mesh that will not be modified
     return 1;
   }
   else
diff --git a/Mesh/DiscreteSurface.h b/Mesh/DiscreteSurface.h
deleted file mode 100644
index ef0dba6357..0000000000
--- a/Mesh/DiscreteSurface.h
+++ /dev/null
@@ -1,66 +0,0 @@
-#ifndef _DISCRETE_SURFACE_H_
-#define _DISCRETE_SURFACE_H_
-
-// Copyright (C) 1997-2003 C. Geuzaine, J.-F. Remacle
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-// USA.
-// 
-// Please report all bugs and problems to "gmsh@geuz.org".
-
-#include "List.h"
-
-
-
-// A convenient surface representation, that can be used
-// as a triangulation for any given surface. See e.g. the "Polygonal
-// Surface" command in the parser, which takes a surface defined by
-// edge loops (that may be initially planar or anything else) and adds
-// a triangulation to it in order to represent the shape of the surface.
-// This triangulation may be a STL triangulation (polygons are triangle)
-// but anything else is okay. Solid modelers like parasolid or proE
-// are able to provide such representations. I have written a
-// translator from ideas to gmsh that does that.
-class POLY_rep 
-{
-public :
-  int num_points, num_polys;
-  List_T *points_and_normals;  // 6 * num_points 
-  List_T *polygons; // first integer gives the number of point of the polygon
-                    // then next ones are the points id's of the polygon
-  POLY_rep(int num_points, int num_polys, List_T *_p, List_T *_pol);
-  POLY_rep();
-  ~POLY_rep();
-  double bounding_box[6];
-  void compute_bounding_box();
-};
-
-// Same thing for discrete curves
-
-class SEGM_rep 
-{
-public :
-  int num_points;
-  List_T *points;  // 3 * num_points 
-  SEGM_rep(int num_points, List_T *_p);
-  SEGM_rep();
-  ~SEGM_rep();
-  double bounding_box[6];
-  void compute_bounding_box();
-};
-
-
-
-#endif
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 855ea0e419..43cba5e7eb 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.85 2005-05-15 01:44:26 geuzaine Exp $
+# $Id: Makefile,v 1.86 2005-06-03 17:32:29 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -101,300 +101,401 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 1D_Mesh.o: 1D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
+  Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h Metric.h Matrix.h Utils.h ../Common/Context.h \
   Interpolation.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Mesh.o: 2D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h Utils.h \
-  Create.h 2D_Mesh.h ../Common/Context.h Interpolation.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h Utils.h Vertex.h Create.h 2D_Mesh.h \
+  ../Common/Context.h Interpolation.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Transfinite.o: 2D_Transfinite.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
-  Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h ../Numeric/Numeric.h Interpolation.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Numeric/Numeric.h \
+  Interpolation.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Elliptic.o: 2D_Elliptic.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_BGMesh.o: 2D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h 2D_Mesh.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Recombine.o: 2D_Recombine.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h Utils.h 2D_Mesh.h Create.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h Utils.h 2D_Mesh.h Create.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_InitMesh.o: 2D_InitMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h 2D_Mesh.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Bowyer.o: 2D_Bowyer.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h 2D_Mesh.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Bricks.o: 2D_Bricks.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h 2D_Mesh.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_DivAndConq.o: 2D_DivAndConq.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h 2D_Mesh.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Util.o: 2D_Util.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h 2D_Mesh.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Links.o: 2D_Links.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h 2D_Mesh.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Tree.o: 2D_Tree.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Element.h Simplex.h \
-  Face.h Edge.h ../Geo/ExtrudeParams.h DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h \
-  2D_Mesh.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Cylindrical.o: 2D_Cylindrical.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Parametric.o: 2D_Parametric.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  Interpolation.h 2D_Mesh.h Create.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Interpolation.h Vertex.h Mesh.h 2D_Mesh.h \
+  Create.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Mesh_Aniso.o: 2D_Mesh_Aniso.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  Interpolation.h Create.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h Interpolation.h Vertex.h Create.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 2D_Mesh_Triangle.o: 2D_Mesh_Triangle.cpp ../Common/Gmsh.h \
   ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h \
-  Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h ../Numeric/Numeric.h ../Common/Context.h
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Numeric/Numeric.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Mesh.o: 3D_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
+  Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h Metric.h Matrix.h 3D_Mesh.h Create.h \
   ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Transfinite.o: 3D_Transfinite.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Element.h Simplex.h \
-  Face.h Edge.h ../Geo/ExtrudeParams.h DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h \
-  Interpolation.h Create.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h Interpolation.h Create.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_BGMesh.o: 3D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Element.h Simplex.h \
-  Face.h Edge.h ../Geo/ExtrudeParams.h DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h \
-  2D_Mesh.h 3D_Mesh.h ../Common/Views.h ../Common/ColorTable.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Numeric/Numeric.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h 2D_Mesh.h 3D_Mesh.h \
+  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Numeric/Numeric.h \
   ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Extrude.o: 3D_Extrude.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  ../Common/Context.h Create.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h ../Common/Context.h Create.h Vertex.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Extrude_Old.o: 3D_Extrude_Old.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  ../Common/Context.h Create.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h ../Common/Context.h Create.h Vertex.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Coherence.o: 3D_Coherence.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
+  Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h Metric.h Matrix.h 3D_Mesh.h Create.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Divide.o: 3D_Divide.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Bricks.o: 3D_Bricks.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 3D_Mesh_Netgen.o: 3D_Mesh_Netgen.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
-  Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h Create.h ../Numeric/Numeric.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h Create.h \
+  ../Numeric/Numeric.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 BDS.o: BDS.cpp BDS.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 MeshQuality.o: MeshQuality.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Create.o: Create.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h Utils.h \
-  ../Common/Context.h Create.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h Utils.h Vertex.h ../Common/Context.h \
+  Create.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Generator.o: Generator.cpp BDS.h ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h Create.h ../Common/Context.h ../Parser/OpenFile.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h Create.h \
+  ../Common/Context.h ../Parser/OpenFile.h ../Common/Views.h \
+  ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Print_Mesh.o: Print_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h Create.h \
-  ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h Create.h Vertex.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Read_Mesh.o: Read_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h ../Geo/CAD.h \
-  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h 3D_Mesh.h \
-  Create.h ../Geo/MinMax.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h 3D_Mesh.h Create.h Vertex.h \
+  ../Geo/MinMax.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 DiscreteSurface.o: DiscreteSurface.cpp ../Common/Gmsh.h \
   ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h Metric.h Matrix.h ../Geo/CAD.h ../Geo/Geo.h \
-  Create.h Interpolation.h ../Common/Context.h BDS.h
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../Numeric/Numeric.h Mesh.h Vertex.h Element.h \
+  Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Geo/ExtrudeParams.h ../Geo/Geo.h Create.h \
+  Interpolation.h ../Common/Context.h BDS.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 SwapEdge.o: SwapEdge.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h SwapPatterns.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h SwapPatterns.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Utils.o: Utils.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  Interpolation.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h Interpolation.h Vertex.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Metric.o: Metric.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  Interpolation.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Mesh.h Matrix.h Interpolation.h Vertex.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Nurbs.o: Nurbs.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Nurbs.h Vertex.h Mesh.h Element.h \
-  Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h \
-  ../Geo/Geo.h ../Geo/GeoUtils.h Create.h ../Geo/CAD.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Nurbs.h Vertex.h Mesh.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Geo/Geo.h \
+  ../Geo/GeoUtils.h ../Mesh/Mesh.h Create.h ../Geo/CAD.h ../Mesh/Vertex.h \
+  ../Geo/ExtrudeParams.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Interpolation.o: Interpolation.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  Nurbs.h Vertex.h Mesh.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h Metric.h Matrix.h ../Geo/CAD.h Utils.h \
-  Interpolation.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h Nurbs.h Vertex.h Mesh.h Element.h \
+  Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Geo/ExtrudeParams.h Utils.h Interpolation.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 SecondOrder.o: SecondOrder.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
-  Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h Utils.h Interpolation.h ../Numeric/Numeric.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h Utils.h Interpolation.h \
+  ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Smoothing.o: Smoothing.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Mesh.h \
-  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 CrossData.o: CrossData.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Element.h Simplex.h \
-  Face.h Edge.h ../Geo/ExtrudeParams.h DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Vertex.o: Vertex.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h Vertex.h \
-  Mesh.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
-  DiscreteSurface.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  Metric.h Matrix.h ../Common/Context.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h Vertex.h Mesh.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Edge.o: Edge.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h Metric.h Matrix.h
+  ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Mesh.h \
+  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Face.o: Face.cpp ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
   ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h Metric.h Matrix.h
+  ../DataStr/List.h ../DataStr/Tree.h ../Numeric/Numeric.h Mesh.h \
+  Vertex.h Element.h Simplex.h Face.h Edge.h ../Geo/ExtrudeParams.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Element.o: Element.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Element.h Simplex.h \
-  Face.h Edge.h ../Geo/ExtrudeParams.h DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h Metric.h Matrix.h \
-  ../Numeric/Numeric.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h Metric.h Matrix.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Mesh//"
 Simplex.o: Simplex.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h DiscreteSurface.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h Mesh.h Vertex.h Element.h Simplex.h \
+  Face.h Edge.h ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h Metric.h Matrix.h ../Common/Context.h
diff --git a/Mesh/Mesh.h b/Mesh/Mesh.h
index 1b4ea14247..b5f19768bb 100644
--- a/Mesh/Mesh.h
+++ b/Mesh/Mesh.h
@@ -27,7 +27,6 @@
 #include "Simplex.h"
 #include "Edge.h"
 #include "ExtrudeParams.h"
-#include "DiscreteSurface.h"
 #include "VertexArray.h"
 #include "SmoothNormals.h"
 
diff --git a/Netgen/Makefile b/Netgen/Makefile
index 05fdc1036f..9248e0ffd5 100644
--- a/Netgen/Makefile
+++ b/Netgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.9 2005-01-01 19:35:31 geuzaine Exp $
+# $Id: Makefile,v 1.10 2005-06-03 17:32:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -148,72 +148,100 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 linopt.o: libsrc/opti/linopt.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/opti/opti.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 bfgs.o: libsrc/opti/bfgs.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/opti/opti.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 linsearch.o: libsrc/opti/linsearch.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/opti/opti.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 global.o: libsrc/meshing/global.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -226,27 +254,37 @@ global.o: libsrc/meshing/global.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 bisect.o: libsrc/meshing/bisect.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -259,27 +297,37 @@ bisect.o: libsrc/meshing/bisect.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshtool.o: libsrc/meshing/meshtool.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -291,39 +339,55 @@ meshtool.o: libsrc/meshing/meshtool.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/include/csg.hpp libsrc/csg/csg.hpp \
-  libsrc/include/meshing.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp \
-  libsrc/include/geometry2d.hpp libsrc/geom2d/geometry2d.hpp \
-  libsrc/geom2d/spline2d.hpp libsrc/geom2d/splinegeometry2.hpp \
-  libsrc/geom2d/geom2dmesh.hpp
+  libsrc/meshing/specials.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/meshing.hpp libsrc/include/../meshing/meshing.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+  libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
+  libsrc/include/../geom2d/splinegeometry2.hpp \
+  libsrc/include/../geom2d/geom2dmesh.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 refine.o: libsrc/meshing/refine.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -336,27 +400,37 @@ refine.o: libsrc/meshing/refine.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 ruler3.o: libsrc/meshing/ruler3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -369,27 +443,37 @@ ruler3.o: libsrc/meshing/ruler3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 improve3.o: libsrc/meshing/improve3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -401,28 +485,38 @@ improve3.o: libsrc/meshing/improve3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp
+  libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 smoothing3.o: libsrc/meshing/smoothing3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -434,28 +528,38 @@ smoothing3.o: libsrc/meshing/smoothing3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp
+  libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 adfront3.o: libsrc/meshing/adfront3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -468,31 +572,45 @@ adfront3.o: libsrc/meshing/adfront3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 tetrarls.o: libsrc/meshing/tetrarls.cpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 prism2rls.o: libsrc/meshing/prism2rls.cpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 pyramidrls.o: libsrc/meshing/pyramidrls.cpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 pyramid2rls.o: libsrc/meshing/pyramid2rls.cpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 netrule3.o: libsrc/meshing/netrule3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -505,27 +623,37 @@ netrule3.o: libsrc/meshing/netrule3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 ruler2.o: libsrc/meshing/ruler2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -538,27 +666,37 @@ ruler2.o: libsrc/meshing/ruler2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshclass.o: libsrc/meshing/meshclass.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -571,27 +709,37 @@ meshclass.o: libsrc/meshing/meshclass.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 improve2.o: libsrc/meshing/improve2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -603,28 +751,38 @@ improve2.o: libsrc/meshing/improve2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp
+  libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 smoothing2.o: libsrc/meshing/smoothing2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -636,28 +794,38 @@ smoothing2.o: libsrc/meshing/smoothing2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp
+  libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 adfront2.o: libsrc/meshing/adfront2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -670,27 +838,37 @@ adfront2.o: libsrc/meshing/adfront2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 netrule2.o: libsrc/meshing/netrule2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -703,28 +881,39 @@ netrule2.o: libsrc/meshing/netrule2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 triarls.o: libsrc/meshing/triarls.cpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 geomsearch.o: libsrc/meshing/geomsearch.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -737,27 +926,37 @@ geomsearch.o: libsrc/meshing/geomsearch.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 secondorder.o: libsrc/meshing/secondorder.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -770,27 +969,37 @@ secondorder.o: libsrc/meshing/secondorder.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshtype.o: libsrc/meshing/meshtype.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -803,27 +1012,37 @@ meshtype.o: libsrc/meshing/meshtype.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 parser3.o: libsrc/meshing/parser3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -836,27 +1055,37 @@ parser3.o: libsrc/meshing/parser3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshing2.o: libsrc/meshing/meshing2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -869,28 +1098,39 @@ meshing2.o: libsrc/meshing/meshing2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 quadrls.o: libsrc/meshing/quadrls.cpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 specials.o: libsrc/meshing/specials.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -903,27 +1143,37 @@ specials.o: libsrc/meshing/specials.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 parser2.o: libsrc/meshing/parser2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -936,27 +1186,37 @@ parser2.o: libsrc/meshing/parser2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshing3.o: libsrc/meshing/meshing3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -969,27 +1229,37 @@ meshing3.o: libsrc/meshing/meshing3.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshfunc.o: libsrc/meshing/meshfunc.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1002,27 +1272,37 @@ meshfunc.o: libsrc/meshing/meshfunc.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 localh.o: libsrc/meshing/localh.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1035,27 +1315,37 @@ localh.o: libsrc/meshing/localh.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 improve2gen.o: libsrc/meshing/improve2gen.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1067,28 +1357,38 @@ improve2gen.o: libsrc/meshing/improve2gen.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp
+  libsrc/meshing/specials.hpp libsrc/include/../opti/opti.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 delaunay.o: libsrc/meshing/delaunay.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1101,93 +1401,135 @@ delaunay.o: libsrc/meshing/delaunay.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 boundarylayer.o: libsrc/meshing/boundarylayer.cpp \
   libsrc/include/mystdlib.h libsrc/meshing/meshing.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
+  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
+  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
+  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
+  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
+  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
+  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
+  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
+  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
+  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
+  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
+  libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 msghandler.o: libsrc/meshing/msghandler.cpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mystdlib.h \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp
+  libsrc/include/../meshing/meshing.hpp libsrc/include/myadt.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mystdlib.h \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshfunc2d.o: libsrc/meshing/meshfunc2d.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1200,27 +1542,37 @@ meshfunc2d.o: libsrc/meshing/meshfunc2d.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 topology.o: libsrc/meshing/topology.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1233,27 +1585,37 @@ topology.o: libsrc/meshing/topology.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 clusters.o: libsrc/meshing/clusters.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1266,27 +1628,37 @@ clusters.o: libsrc/meshing/clusters.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 curvedelems.o: libsrc/meshing/curvedelems.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1299,27 +1671,37 @@ curvedelems.o: libsrc/meshing/curvedelems.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 curvedelems2.o: libsrc/meshing/curvedelems2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1332,27 +1714,37 @@ curvedelems2.o: libsrc/meshing/curvedelems2.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
   libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
   libsrc/meshing/specials.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 hprefinement.o: libsrc/meshing/hprefinement.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp libsrc/meshing/msghandler.hpp \
   libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
   libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
   libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
@@ -1367,1628 +1759,2654 @@ hprefinement.o: libsrc/meshing/hprefinement.cpp libsrc/include/mystdlib.h \
   libsrc/meshing/specials.hpp libsrc/meshing/hpref_trig.hpp \
   libsrc/meshing/hpref_quad.hpp libsrc/meshing/hpref_tet.hpp \
   libsrc/meshing/hpref_prism.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 nglib.o: libsrc/interface/nglib.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp \
-  libsrc/include/stlgeom.hpp libsrc/stlgeom/stlgeom.hpp \
-  libsrc/stlgeom/stltopology.hpp libsrc/stlgeom/stltool.hpp \
-  libsrc/stlgeom/stlline.hpp libsrc/stlgeom/meshstlsurface.hpp \
-  libsrc/include/geometry2d.hpp libsrc/geom2d/geometry2d.hpp \
-  libsrc/geom2d/spline2d.hpp libsrc/geom2d/splinegeometry2.hpp \
-  libsrc/geom2d/geom2dmesh.hpp libsrc/interface/nglib.h
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+  libsrc/include/stlgeom.hpp libsrc/include/../stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../stlgeom/stltopology.hpp \
+  libsrc/include/../stlgeom/stltool.hpp \
+  libsrc/include/../stlgeom/stlline.hpp \
+  libsrc/include/../stlgeom/meshstlsurface.hpp \
+  libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
+  libsrc/include/../geom2d/splinegeometry2.hpp \
+  libsrc/include/../geom2d/geom2dmesh.hpp libsrc/interface/nglib.h
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 geomtest3d.o: libsrc/gprim/geomtest3d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 geom2d.o: libsrc/gprim/geom2d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 geom3d.o: libsrc/gprim/geom3d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 adtree.o: libsrc/gprim/adtree.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 transform3d.o: libsrc/gprim/transform3d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 geomfuncs.o: libsrc/gprim/geomfuncs.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 polynomial.o: libsrc/linalg/polynomial.cpp libsrc/include/mystdlib.h \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 densemat.o: libsrc/linalg/densemat.cpp libsrc/include/mystdlib.h \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 vector.o: libsrc/linalg/vector.cpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 algprim.o: libsrc/csg/algprim.cpp libsrc/include/mystdlib.h \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 brick.o: libsrc/csg/brick.cpp libsrc/include/mystdlib.h \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 manifold.o: libsrc/csg/manifold.cpp libsrc/include/csg.hpp \
-  libsrc/csg/csg.hpp libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mystdlib.h libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/../csg/csg.hpp libsrc/include/myadt.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mystdlib.h \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 bspline2d.o: libsrc/csg/bspline2d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/csg.hpp libsrc/include/../csg/csg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshsurf.o: libsrc/csg/meshsurf.cpp libsrc/include/mystdlib.h \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/csg.hpp libsrc/include/../csg/csg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 csgeom.o: libsrc/csg/csgeom.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 polyhedra.o: libsrc/csg/polyhedra.cpp libsrc/include/mystdlib.h \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 curve2d.o: libsrc/csg/curve2d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/csg.hpp libsrc/csg/csg.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 singularref.o: libsrc/csg/singularref.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 edgeflw.o: libsrc/csg/edgeflw.cpp libsrc/include/mystdlib.h \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/csg/surface.hpp \
-  libsrc/csg/solid.hpp libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/meshing.hpp libsrc/include/../meshing/meshing.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 solid.o: libsrc/csg/solid.cpp libsrc/include/mystdlib.h \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 explicitcurve2d.o: libsrc/csg/explicitcurve2d.cpp \
-  libsrc/include/mystdlib.h libsrc/include/csg.hpp libsrc/csg/csg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/mystdlib.h libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/myadt.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 specpoin.o: libsrc/csg/specpoin.cpp libsrc/include/mystdlib.h \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/csg/surface.hpp \
-  libsrc/csg/solid.hpp libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/meshing.hpp libsrc/include/../meshing/meshing.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 gencyl.o: libsrc/csg/gencyl.cpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mystdlib.h \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/../linalg/linalg.hpp libsrc/include/myadt.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mystdlib.h \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 revolution.o: libsrc/csg/revolution.cpp libsrc/include/mystdlib.h \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 genmesh.o: libsrc/csg/genmesh.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 spline3d.o: libsrc/csg/spline3d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 surface.o: libsrc/csg/surface.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/csg.hpp libsrc/csg/csg.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+  libsrc/include/../linalg/linalg.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 identify.o: libsrc/csg/identify.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 triapprox.o: libsrc/csg/triapprox.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 geom2dmesh.o: libsrc/geom2d/geom2dmesh.cpp libsrc/include/mystdlib.h \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp \
-  libsrc/include/geometry2d.hpp libsrc/geom2d/geometry2d.hpp \
-  libsrc/geom2d/spline2d.hpp libsrc/geom2d/splinegeometry2.hpp \
-  libsrc/geom2d/geom2dmesh.hpp
+  libsrc/include/csg.hpp libsrc/include/../csg/csg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+  libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
+  libsrc/include/../geom2d/splinegeometry2.hpp \
+  libsrc/include/../geom2d/geom2dmesh.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 spline2d.o: libsrc/geom2d/spline2d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp \
-  libsrc/geom2d/spline2d.hpp
+  libsrc/include/csg.hpp libsrc/include/../csg/csg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/geom2d/spline2d.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 splinegeometry2.o: libsrc/geom2d/splinegeometry2.cpp \
-  libsrc/include/mystdlib.h libsrc/include/csg.hpp libsrc/csg/csg.hpp \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/csg/surface.hpp libsrc/csg/solid.hpp libsrc/csg/identify.hpp \
-  libsrc/csg/singularref.hpp libsrc/csg/csgeom.hpp \
-  libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp libsrc/csg/brick.hpp \
-  libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp libsrc/csg/curve2d.hpp \
-  libsrc/csg/explicitcurve2d.hpp libsrc/csg/gencyl.hpp \
-  libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp \
-  libsrc/geom2d/spline2d.hpp libsrc/geom2d/splinegeometry2.hpp
+  libsrc/include/mystdlib.h libsrc/include/csg.hpp \
+  libsrc/include/../csg/csg.hpp libsrc/include/myadt.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/geom2d/spline2d.hpp \
+  libsrc/geom2d/splinegeometry2.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 genmesh2d.o: libsrc/geom2d/genmesh2d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/csg.hpp libsrc/csg/csg.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/opti.hpp \
-  libsrc/opti/opti.hpp libsrc/meshing/msghandler.hpp \
-  libsrc/meshing/meshtype.hpp libsrc/meshing/localh.hpp \
-  libsrc/meshing/meshclass.hpp libsrc/meshing/global.hpp \
-  libsrc/meshing/meshtool.hpp libsrc/meshing/ruler2.hpp \
-  libsrc/meshing/adfront2.hpp libsrc/meshing/meshing2.hpp \
-  libsrc/meshing/improve2.hpp libsrc/meshing/geomsearch.hpp \
-  libsrc/meshing/adfront3.hpp libsrc/meshing/ruler3.hpp \
-  libsrc/meshing/meshing3.hpp libsrc/meshing/improve3.hpp \
-  libsrc/meshing/findip.hpp libsrc/meshing/topology.hpp \
-  libsrc/meshing/curvedelems.hpp libsrc/meshing/bisect.hpp \
-  libsrc/meshing/clusters.hpp libsrc/meshing/meshfunc.hpp \
-  libsrc/meshing/hprefinement.hpp libsrc/meshing/boundarylayer.hpp \
-  libsrc/meshing/specials.hpp libsrc/csg/surface.hpp libsrc/csg/solid.hpp \
-  libsrc/csg/identify.hpp libsrc/csg/singularref.hpp \
-  libsrc/csg/csgeom.hpp libsrc/csg/triapprox.hpp libsrc/csg/algprim.hpp \
-  libsrc/csg/brick.hpp libsrc/csg/spline3d.hpp libsrc/csg/manifold.hpp \
-  libsrc/csg/curve2d.hpp libsrc/csg/explicitcurve2d.hpp \
-  libsrc/csg/gencyl.hpp libsrc/csg/polyhedra.hpp libsrc/csg/extrusion.hpp \
-  libsrc/csg/revolution.hpp libsrc/csg/specpoin.hpp \
-  libsrc/csg/edgeflw.hpp libsrc/csg/meshsurf.hpp \
-  libsrc/include/geometry2d.hpp libsrc/geom2d/geometry2d.hpp \
-  libsrc/geom2d/spline2d.hpp libsrc/geom2d/splinegeometry2.hpp \
-  libsrc/geom2d/geom2dmesh.hpp
+  libsrc/include/csg.hpp libsrc/include/../csg/csg.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/linalg.hpp libsrc/include/../linalg/linalg.hpp \
+  libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp \
+  libsrc/include/../csg/surface.hpp libsrc/include/../csg/solid.hpp \
+  libsrc/include/../csg/identify.hpp \
+  libsrc/include/../csg/singularref.hpp libsrc/include/../csg/csgeom.hpp \
+  libsrc/include/../csg/triapprox.hpp libsrc/include/../csg/algprim.hpp \
+  libsrc/include/../csg/brick.hpp libsrc/include/../csg/spline3d.hpp \
+  libsrc/include/../csg/manifold.hpp libsrc/include/../csg/curve2d.hpp \
+  libsrc/include/../csg/explicitcurve2d.hpp \
+  libsrc/include/../csg/gencyl.hpp libsrc/include/../csg/polyhedra.hpp \
+  libsrc/include/../csg/extrusion.hpp \
+  libsrc/include/../csg/revolution.hpp libsrc/include/../csg/specpoin.hpp \
+  libsrc/include/../csg/edgeflw.hpp libsrc/include/../csg/meshsurf.hpp \
+  libsrc/include/geometry2d.hpp libsrc/include/../geom2d/geometry2d.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/include/../geom2d/spline2d.hpp \
+  libsrc/include/../geom2d/splinegeometry2.hpp \
+  libsrc/include/../geom2d/geom2dmesh.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 meshstlsurface.o: libsrc/stlgeom/meshstlsurface.cpp \
   libsrc/include/mystdlib.h libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mydefs.hpp \
-  libsrc/general/ngexception.hpp libsrc/general/parthreads.hpp \
-  libsrc/general/moveablemem.hpp libsrc/general/dynamicmem.hpp \
-  libsrc/general/template.hpp libsrc/general/array.hpp \
-  libsrc/general/table.hpp libsrc/general/hashtabl.hpp \
-  libsrc/general/symbolta.hpp libsrc/general/bitarray.hpp \
-  libsrc/general/flags.hpp libsrc/general/spbita2d.hpp \
-  libsrc/general/seti.hpp libsrc/general/optmem.hpp \
-  libsrc/general/autoptr.hpp libsrc/general/sort.hpp \
-  libsrc/general/stack.hpp libsrc/general/mystring.hpp \
-  libsrc/include/linalg.hpp libsrc/linalg/linalg.hpp \
-  libsrc/linalg/vector.hpp libsrc/linalg/densemat.hpp \
-  libsrc/linalg/polynomial.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/stlgeom/stlgeom.hpp libsrc/stlgeom/stltopology.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mydefs.hpp \
+  libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
   libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
   libsrc/stlgeom/meshstlsurface.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 stlline.o: libsrc/stlgeom/stlline.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/stlgeom/stlgeom.hpp libsrc/stlgeom/stltopology.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
   libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
   libsrc/stlgeom/meshstlsurface.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 stltopology.o: libsrc/stlgeom/stltopology.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/stlgeom/stlgeom.hpp libsrc/stlgeom/stltopology.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
   libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
   libsrc/stlgeom/meshstlsurface.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 stltool.o: libsrc/stlgeom/stltool.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/stlgeom/stlgeom.hpp libsrc/stlgeom/stltopology.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
   libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
   libsrc/stlgeom/meshstlsurface.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 stlgeom.o: libsrc/stlgeom/stlgeom.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/stlgeom/stlgeom.hpp libsrc/stlgeom/stltopology.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
   libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
   libsrc/stlgeom/meshstlsurface.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 stlgeomchart.o: libsrc/stlgeom/stlgeomchart.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/stlgeom/stlgeom.hpp libsrc/stlgeom/stltopology.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
   libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
   libsrc/stlgeom/meshstlsurface.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 stlgeommesh.o: libsrc/stlgeom/stlgeommesh.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp \
-  libsrc/include/meshing.hpp libsrc/meshing/meshing.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/stlgeom/stlgeom.hpp libsrc/stlgeom/stltopology.hpp \
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/meshing.hpp \
+  libsrc/include/../meshing/meshing.hpp libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/stlgeom/stlgeom.hpp \
+  libsrc/include/../gprim/gprim.hpp libsrc/stlgeom/stltopology.hpp \
   libsrc/stlgeom/stltool.hpp libsrc/stlgeom/stlline.hpp \
   libsrc/stlgeom/meshstlsurface.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 moveablemem.o: libsrc/general/moveablemem.cpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mystdlib.h \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/../general/myadt.hpp libsrc/include/mystdlib.h \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 ngexception.o: libsrc/general/ngexception.cpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mystdlib.h \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/../general/myadt.hpp libsrc/include/mystdlib.h \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 table.o: libsrc/general/table.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 optmem.o: libsrc/general/optmem.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 spbita2d.o: libsrc/general/spbita2d.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 hashtabl.o: libsrc/general/hashtabl.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 sort.o: libsrc/general/sort.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 flags.o: libsrc/general/flags.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 seti.o: libsrc/general/seti.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 bitarray.o: libsrc/general/bitarray.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 array.o: libsrc/general/array.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 symbolta.o: libsrc/general/symbolta.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 mystring.o: libsrc/general/mystring.cpp libsrc/include/mystdlib.h \
-  libsrc/include/myadt.hpp libsrc/general/myadt.hpp \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/gprim.hpp libsrc/gprim/gprim.hpp \
-  libsrc/gprim/geomobjects.hpp libsrc/gprim/geomops.hpp \
-  libsrc/gprim/geomfuncs.hpp libsrc/gprim/geom2d.hpp \
-  libsrc/gprim/geom3d.hpp libsrc/gprim/geomtest3d.hpp \
-  libsrc/gprim/transform3d.hpp libsrc/gprim/adtree.hpp
+  libsrc/include/myadt.hpp libsrc/include/../general/myadt.hpp \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp
+# 1 "/Users/geuzaine/.gmsh/Netgen//"
 nglib_addon.o: nglib_addon.cpp libsrc/include/meshing.hpp \
-  libsrc/meshing/meshing.hpp libsrc/include/myadt.hpp \
-  libsrc/general/myadt.hpp libsrc/include/mystdlib.h \
-  libsrc/include/mydefs.hpp libsrc/general/ngexception.hpp \
-  libsrc/general/parthreads.hpp libsrc/general/moveablemem.hpp \
-  libsrc/general/dynamicmem.hpp libsrc/general/template.hpp \
-  libsrc/general/array.hpp libsrc/general/table.hpp \
-  libsrc/general/hashtabl.hpp libsrc/general/symbolta.hpp \
-  libsrc/general/bitarray.hpp libsrc/general/flags.hpp \
-  libsrc/general/spbita2d.hpp libsrc/general/seti.hpp \
-  libsrc/general/optmem.hpp libsrc/general/autoptr.hpp \
-  libsrc/general/sort.hpp libsrc/general/stack.hpp \
-  libsrc/general/mystring.hpp libsrc/include/gprim.hpp \
-  libsrc/gprim/gprim.hpp libsrc/gprim/geomobjects.hpp \
-  libsrc/gprim/geomops.hpp libsrc/gprim/geomfuncs.hpp \
-  libsrc/gprim/geom2d.hpp libsrc/gprim/geom3d.hpp \
-  libsrc/gprim/geomtest3d.hpp libsrc/gprim/transform3d.hpp \
-  libsrc/gprim/adtree.hpp libsrc/include/linalg.hpp \
-  libsrc/linalg/linalg.hpp libsrc/linalg/vector.hpp \
-  libsrc/linalg/densemat.hpp libsrc/linalg/polynomial.hpp \
-  libsrc/include/opti.hpp libsrc/opti/opti.hpp \
-  libsrc/meshing/msghandler.hpp libsrc/meshing/meshtype.hpp \
-  libsrc/meshing/localh.hpp libsrc/meshing/meshclass.hpp \
-  libsrc/meshing/global.hpp libsrc/meshing/meshtool.hpp \
-  libsrc/meshing/ruler2.hpp libsrc/meshing/adfront2.hpp \
-  libsrc/meshing/meshing2.hpp libsrc/meshing/improve2.hpp \
-  libsrc/meshing/geomsearch.hpp libsrc/meshing/adfront3.hpp \
-  libsrc/meshing/ruler3.hpp libsrc/meshing/meshing3.hpp \
-  libsrc/meshing/improve3.hpp libsrc/meshing/findip.hpp \
-  libsrc/meshing/topology.hpp libsrc/meshing/curvedelems.hpp \
-  libsrc/meshing/bisect.hpp libsrc/meshing/clusters.hpp \
-  libsrc/meshing/meshfunc.hpp libsrc/meshing/hprefinement.hpp \
-  libsrc/meshing/boundarylayer.hpp libsrc/meshing/specials.hpp \
-  libsrc/interface/nglib.h ../Common/Message.h
+  libsrc/include/../meshing/meshing.hpp libsrc/include/myadt.hpp \
+  libsrc/include/../general/myadt.hpp libsrc/include/mystdlib.h \
+  libsrc/include/mydefs.hpp libsrc/include/../general/ngexception.hpp \
+  libsrc/include/../general/parthreads.hpp \
+  libsrc/include/../general/moveablemem.hpp \
+  libsrc/include/../general/dynamicmem.hpp \
+  libsrc/include/../general/template.hpp \
+  libsrc/include/../general/array.hpp libsrc/include/../general/table.hpp \
+  libsrc/include/../general/hashtabl.hpp \
+  libsrc/include/../general/symbolta.hpp \
+  libsrc/include/../general/bitarray.hpp \
+  libsrc/include/../general/flags.hpp \
+  libsrc/include/../general/spbita2d.hpp \
+  libsrc/include/../general/seti.hpp libsrc/include/../general/optmem.hpp \
+  libsrc/include/../general/autoptr.hpp \
+  libsrc/include/../general/sort.hpp libsrc/include/../general/stack.hpp \
+  libsrc/include/../general/mystring.hpp libsrc/include/gprim.hpp \
+  libsrc/include/../gprim/gprim.hpp \
+  libsrc/include/../gprim/geomobjects.hpp \
+  libsrc/include/../gprim/geomops.hpp \
+  libsrc/include/../gprim/geomfuncs.hpp \
+  libsrc/include/../gprim/geom2d.hpp libsrc/include/../gprim/geom3d.hpp \
+  libsrc/include/../gprim/geomtest3d.hpp \
+  libsrc/include/../gprim/transform3d.hpp \
+  libsrc/include/../gprim/adtree.hpp libsrc/include/linalg.hpp \
+  libsrc/include/../linalg/linalg.hpp libsrc/include/../linalg/vector.hpp \
+  libsrc/include/../linalg/densemat.hpp \
+  libsrc/include/../linalg/polynomial.hpp libsrc/include/opti.hpp \
+  libsrc/include/../opti/opti.hpp \
+  libsrc/include/../meshing/msghandler.hpp \
+  libsrc/include/../meshing/meshtype.hpp \
+  libsrc/include/../meshing/localh.hpp \
+  libsrc/include/../meshing/meshclass.hpp \
+  libsrc/include/../meshing/global.hpp \
+  libsrc/include/../meshing/meshtool.hpp \
+  libsrc/include/../meshing/ruler2.hpp \
+  libsrc/include/../meshing/adfront2.hpp \
+  libsrc/include/../meshing/meshing2.hpp \
+  libsrc/include/../meshing/improve2.hpp \
+  libsrc/include/../meshing/geomsearch.hpp \
+  libsrc/include/../meshing/adfront3.hpp \
+  libsrc/include/../meshing/ruler3.hpp \
+  libsrc/include/../meshing/meshing3.hpp \
+  libsrc/include/../meshing/improve3.hpp \
+  libsrc/include/../meshing/findip.hpp \
+  libsrc/include/../meshing/topology.hpp \
+  libsrc/include/../meshing/curvedelems.hpp \
+  libsrc/include/../meshing/bisect.hpp \
+  libsrc/include/../meshing/clusters.hpp \
+  libsrc/include/../meshing/meshfunc.hpp \
+  libsrc/include/../meshing/hprefinement.hpp \
+  libsrc/include/../meshing/boundarylayer.hpp \
+  libsrc/include/../meshing/specials.hpp libsrc/interface/nglib.h \
+  ../Common/Message.h
diff --git a/Numeric/Makefile b/Numeric/Makefile
index e1e7d0a9ad..cb77f38b70 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 2005-01-01 19:35:32 geuzaine Exp $
+# $Id: Makefile,v 1.19 2005-06-03 17:32:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -53,13 +53,20 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Numeric//"
 Numeric.o: Numeric.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Numeric//"
 EigSolve.o: EigSolve.cpp
+# 1 "/Users/geuzaine/.gmsh/Numeric//"
 gsl_newt.o: gsl_newt.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Numeric//"
 gsl_brent.o: gsl_brent.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Numeric.h
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 71af3a5f73..7c553d082b 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 2005-01-01 19:35:32 geuzaine Exp $
+# $Id: Makefile,v 1.18 2005-06-03 17:32:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -50,4 +50,5 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Parallel//"
 ParUtil.o: ParUtil.cpp ParUtil.h
diff --git a/Parser/Makefile b/Parser/Makefile
index f0c5e9d004..48546d61a8 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.72 2005-05-15 01:44:26 geuzaine Exp $
+# $Id: Makefile,v 1.73 2005-06-03 17:32:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -74,40 +74,55 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Parser//"
 Gmsh.tab.o: Gmsh.tab.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
   ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Parallel/ParUtil.h ../Common/Gmsh.h \
-  ../DataStr/Malloc.h ../DataStr/Tree.h ../DataStr/avl.h \
-  ../DataStr/Tools.h ../Numeric/Numeric.h ../Common/Context.h \
-  ../Geo/Geo.h ../Geo/GeoUtils.h ../Mesh/Mesh.h ../Mesh/Vertex.h \
-  ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h \
-  ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h ../Mesh/Nurbs.h ../Geo/CAD.h ../Graphics/Draw.h \
-  ../Mesh/Create.h ../Geo/StepGeomDatabase.h ../Common/Colors.h Parser.h \
-  OpenFile.h ../Common/CommandLine.h FunctionManager.h ../Common/Timer.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Parallel/ParUtil.h \
+  ../Common/Gmsh.h ../Common/Message.h ../DataStr/Malloc.h \
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../Numeric/Numeric.h ../Common/Context.h ../Geo/Geo.h \
+  ../Geo/GeoUtils.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+  ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+  ../Mesh/Matrix.h ../Mesh/Nurbs.h ../Mesh/Vertex.h ../Mesh/Mesh.h \
+  ../Geo/CAD.h ../Geo/ExtrudeParams.h ../Graphics/Draw.h ../Mesh/Create.h \
+  ../Mesh/Vertex.h ../Mesh/Mesh.h ../Geo/StepGeomDatabase.h \
+  ../Common/Colors.h ../Common/Options.h Parser.h OpenFile.h \
+  ../Common/CommandLine.h FunctionManager.h ../Common/Timer.h \
   ../Graphics/CreateFile.h ../Common/Visibility.h ../Common/GmshVersion.h
+# 1 "/Users/geuzaine/.gmsh/Parser//"
 Gmsh.yy.o: Gmsh.yy.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h ../Geo/Geo.h \
-  ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  Gmsh.tab.hpp
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  ../Numeric/Numeric.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
+  ../Geo/ExtrudeParams.h Gmsh.tab.hpp
+# 1 "/Users/geuzaine/.gmsh/Parser//"
 OpenFile.o: OpenFile.cpp ../Mesh/BDS.h ../Common/Gmsh.h \
   ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
-  ../Numeric/Numeric.h ../Common/Context.h Parser.h OpenFile.h \
-  ../Common/CommandLine.h ../Plugin/PluginManager.h ../Plugin/Plugin.h \
-  ../Common/Options.h ../Common/Views.h ../Common/ColorTable.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Geo/Geo.h \
-  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h \
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../Numeric/Numeric.h ../Common/Context.h Parser.h \
+  OpenFile.h ../Common/CommandLine.h ../Plugin/PluginManager.h \
+  ../Plugin/Plugin.h ../Common/Options.h ../Common/Views.h \
+  ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Geo/Geo.h \
+  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
   ../Geo/MinMax.h ../Common/Visibility.h ../Graphics/ReadImg.h \
   ../Common/GmshUI.h ../Graphics/Draw.h ../Fltk/GUI.h \
   ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h
+# 1 "/Users/geuzaine/.gmsh/Parser//"
 FunctionManager.o: FunctionManager.cpp FunctionManager.h
diff --git a/Plugin/Makefile b/Plugin/Makefile
index b909254a4e..8abda091e8 100644
--- a/Plugin/Makefile
+++ b/Plugin/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.81 2005-03-09 02:19:09 geuzaine Exp $
+# $Id: Makefile,v 1.82 2005-06-03 17:32:30 geuzaine Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -71,209 +71,272 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h PluginManager.h \
-  CutMap.h Levelset.h CutGrid.h StreamLines.h CutPlane.h CutParametric.h \
-  CutSphere.h Skin.h ../DataStr/Tree.h ../DataStr/avl.h Extract.h \
-  HarmonicToTime.h Integrate.h Gradient.h Curl.h Divergence.h Annotate.h \
-  Remove.h DecomposeInSimplex.h Smooth.h Transform.h Triangulate.h \
-  SphericalRaise.h DisplacementRaise.h StructuralSolver.h ../Geo/Geo.h \
-  ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  ../Common/GmshUI.h Eigenvectors.h Eigenvalues.h Lambda2.h \
-  ../Numeric/Numeric.h Evaluate.h OctreePost.h Octree.h OctreeInternals.h \
-  Probe.h ../Common/Context.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  PluginManager.h CutMap.h Levelset.h CutGrid.h StreamLines.h CutPlane.h \
+  CutParametric.h CutSphere.h Skin.h ../DataStr/Tree.h ../DataStr/avl.h \
+  Extract.h HarmonicToTime.h Integrate.h Gradient.h Curl.h Divergence.h \
+  Annotate.h Remove.h DecomposeInSimplex.h Smooth.h Transform.h \
+  Triangulate.h SphericalRaise.h DisplacementRaise.h StructuralSolver.h \
+  ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Geo/ExtrudeParams.h \
+  ../Mesh/Metric.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h \
+  ../Mesh/Matrix.h ../Common/GmshUI.h Eigenvectors.h Eigenvalues.h \
+  Lambda2.h ../Numeric/Numeric.h Evaluate.h OctreePost.h Octree.h \
+  OctreeInternals.h Probe.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Levelset.o: Levelset.cpp Levelset.h Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h DecomposeInSimplex.h \
-  ../DataStr/Tools.h ../DataStr/Tree.h ../DataStr/avl.h ../Graphics/Iso.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  DecomposeInSimplex.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../DataStr/avl.h ../Graphics/Iso.h \
   ../Numeric/Numeric.h ../Common/Context.h ../DataStr/Malloc.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 CutPlane.o: CutPlane.cpp CutPlane.h Levelset.h Plugin.h \
   ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Context.h ../Common/GmshUI.h \
-  ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Mesh/Metric.h ../Mesh/Matrix.h
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+  ../Common/GmshUI.h ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h \
+  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 CutSphere.o: CutSphere.cpp CutSphere.h Levelset.h Plugin.h \
   ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Context.h ../Common/GmshUI.h \
-  ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Mesh/Metric.h ../Mesh/Matrix.h
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+  ../Common/GmshUI.h ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h \
+  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 CutMap.o: CutMap.cpp CutMap.h Levelset.h Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Smooth.o: Smooth.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Smooth.h \
-  ../Common/Context.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Smooth.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 CutParametric.o: CutParametric.cpp OctreePost.h Octree.h \
   OctreeInternals.h CutParametric.h Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h \
-  ../Common/GmshUI.h ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h \
+  ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Lambda2.o: Lambda2.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Lambda2.h \
-  ../Numeric/Numeric.h ../Common/Context.h ShapeFunctions.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Lambda2.h ../Numeric/Numeric.h ../Common/Context.h ShapeFunctions.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Eigenvectors.o: Eigenvectors.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Eigenvectors.h \
-  ../Common/Context.h ../DataStr/Malloc.h ../Numeric/Numeric.h \
-  ../Numeric/EigSolve.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Eigenvectors.h ../Common/Context.h ../DataStr/Malloc.h \
+  ../Numeric/Numeric.h ../Numeric/EigSolve.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Eigenvalues.o: Eigenvalues.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Eigenvalues.h \
-  ../Common/Context.h ../DataStr/Malloc.h ../Numeric/Numeric.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Eigenvalues.h ../Common/Context.h ../DataStr/Malloc.h \
+  ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Octree.o: Octree.cpp Octree.h OctreeInternals.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 OctreeInternals.o: OctreeInternals.cpp ../Common/Message.h \
   OctreeInternals.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 OctreePost.o: OctreePost.cpp Octree.h OctreeInternals.h OctreePost.h \
   ../DataStr/List.h ../Common/Views.h ../Common/ColorTable.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Numeric/Numeric.h \
-  ../Common/Message.h ShapeFunctions.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Numeric/Numeric.h ../Common/Message.h ShapeFunctions.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 StreamLines.o: StreamLines.cpp OctreePost.h Octree.h OctreeInternals.h \
   StreamLines.h Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h \
-  ../Common/GmshUI.h ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h \
+  ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 CutGrid.o: CutGrid.cpp OctreePost.h Octree.h OctreeInternals.h CutGrid.h \
   Plugin.h ../Common/Options.h ../Common/Message.h ../Common/Views.h \
   ../Common/ColorTable.h ../DataStr/List.h ../Common/VertexArray.h \
   ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/Context.h ../Common/GmshUI.h \
-  ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Mesh/Metric.h ../Mesh/Matrix.h
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/Context.h \
+  ../Common/GmshUI.h ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h \
+  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Transform.o: Transform.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Transform.h \
-  ../Common/Context.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Transform.h ../Common/Context.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Triangulate.o: Triangulate.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../DataStr/Tools.h Plugin.h ../Common/Options.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/VertexArray.h \
-  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h Triangulate.h ../Common/Context.h \
-  ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Element.h \
-  ../Mesh/Simplex.h ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  ../Mesh/Utils.h ../Mesh/Create.h
+  ../DataStr/avl.h ../DataStr/Tools.h ../DataStr/List.h ../DataStr/Tree.h \
+  Plugin.h ../Common/Options.h ../Common/Views.h ../Common/ColorTable.h \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Triangulate.h ../Common/Context.h ../Geo/Geo.h ../Mesh/Mesh.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h ../Mesh/Utils.h \
+  ../Mesh/Vertex.h ../Mesh/Mesh.h ../Mesh/Create.h ../Mesh/Vertex.h \
+  ../Mesh/Mesh.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 SphericalRaise.o: SphericalRaise.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h SphericalRaise.h \
-  ../Common/Context.h ../Numeric/Numeric.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  SphericalRaise.h ../Common/Context.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 DisplacementRaise.o: DisplacementRaise.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h DisplacementRaise.h \
-  ../Common/Context.h ../Numeric/Numeric.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  DisplacementRaise.h ../Common/Context.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 StructuralSolver.o: StructuralSolver.cpp StructuralSolver.h ../Geo/Geo.h \
   ../DataStr/List.h ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h \
-  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h ../Mesh/Face.h \
-  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/DiscreteSurface.h \
-  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
-  ../Mesh/Matrix.h Plugin.h ../Common/Options.h ../Common/Message.h \
-  ../Common/Views.h ../Common/ColorTable.h ../Common/GmshMatrix.h \
-  ../Common/AdaptiveViews.h ../Common/GmshUI.h ../Common/Context.h \
-  ../DataStr/Tools.h ../Graphics/Draw.h ../Mesh/Utils.h \
-  ../Numeric/Numeric.h ../Fltk/Shortcut_Window.h
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h Plugin.h \
+  ../Common/Options.h ../Common/Message.h ../Common/Views.h \
+  ../Common/ColorTable.h ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Common/GmshMatrix.h ../Common/GmshUI.h \
+  ../Common/Context.h ../DataStr/Tools.h ../DataStr/List.h \
+  ../DataStr/Tree.h ../Graphics/Draw.h ../Mesh/Utils.h ../Mesh/Vertex.h \
+  ../Mesh/Mesh.h ../Numeric/Numeric.h ../Fltk/Shortcut_Window.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Skin.o: Skin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Skin.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../Common/Context.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Skin.h ../DataStr/Tree.h ../DataStr/avl.h ../Common/Context.h \
   ../DataStr/Malloc.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Extract.o: Extract.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Extract.h \
-  ../Common/Context.h ../DataStr/Malloc.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Extract.h ../Common/Context.h ../DataStr/Malloc.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 DecomposeInSimplex.o: DecomposeInSimplex.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h DecomposeInSimplex.h \
-  ../DataStr/Tree.h ../DataStr/avl.h ../Common/Context.h \
-  ../DataStr/Malloc.h ../Numeric/Numeric.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  DecomposeInSimplex.h ../DataStr/Tree.h ../DataStr/avl.h \
+  ../Common/Context.h ../DataStr/Malloc.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Evaluate.o: Evaluate.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Evaluate.h \
-  OctreePost.h Octree.h OctreeInternals.h ../Common/Context.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Evaluate.h OctreePost.h Octree.h OctreeInternals.h ../Common/Context.h \
   ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Integrate.o: Integrate.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Integrate.h \
-  ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Integrate.h ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Gradient.o: Gradient.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Gradient.h \
-  ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Gradient.h ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Curl.o: Curl.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Curl.h \
-  ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Curl.h ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Divergence.o: Divergence.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Divergence.h \
-  ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Divergence.h ../Common/Context.h ../Numeric/Numeric.h ShapeFunctions.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Annotate.o: Annotate.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Annotate.h \
-  ../Common/Context.h ../Numeric/Numeric.h ../Common/GmshUI.h \
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Annotate.h ../Common/Context.h ../Numeric/Numeric.h ../Common/GmshUI.h \
   ../Fltk/GUI.h ../Fltk/Opengl_Window.h ../Mesh/Mesh.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h \
+  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Face.h \
+  ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Edge.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
+  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
   ../Fltk/Colorbar_Window.h ../Graphics/Draw.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Remove.o: Remove.cpp Plugin.h ../Common/Options.h ../Common/Message.h \
   ../Common/Views.h ../Common/ColorTable.h ../DataStr/List.h \
   ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h Remove.h \
-  ../Common/Context.h ../Numeric/Numeric.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  Remove.h ../Common/Context.h ../Numeric/Numeric.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 Probe.o: Probe.cpp Probe.h Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/Context.h \
-  ../Common/GmshUI.h ../Graphics/Draw.h ../Mesh/Mesh.h ../DataStr/Tree.h \
-  ../DataStr/avl.h ../Mesh/Vertex.h ../Mesh/Element.h ../Mesh/Simplex.h \
-  ../Mesh/Face.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \
-  ../Mesh/DiscreteSurface.h ../Mesh/Metric.h ../Mesh/Matrix.h \
-  OctreePost.h Octree.h OctreeInternals.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  ../Common/Context.h ../Common/GmshUI.h ../Graphics/Draw.h \
+  ../Mesh/Mesh.h ../DataStr/Tree.h ../DataStr/avl.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Vertex.h \
+  ../Mesh/Element.h ../Mesh/Face.h ../Mesh/Vertex.h ../Mesh/Element.h \
+  ../Mesh/Edge.h ../Mesh/Vertex.h ../Mesh/Simplex.h \
+  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Mesh/Vertex.h \
+  ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h OctreePost.h Octree.h \
+  OctreeInternals.h
+# 1 "/Users/geuzaine/.gmsh/Plugin//"
 HarmonicToTime.o: HarmonicToTime.cpp Plugin.h ../Common/Options.h \
   ../Common/Message.h ../Common/Views.h ../Common/ColorTable.h \
   ../DataStr/List.h ../Common/VertexArray.h ../Common/SmoothNormals.h \
-  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h HarmonicToTime.h \
-  ../Common/Context.h ../Numeric/Numeric.h
+  ../Common/GmshMatrix.h ../Common/AdaptiveViews.h ../Common/GmshMatrix.h \
+  HarmonicToTime.h ../Common/Context.h ../Numeric/Numeric.h
-- 
GitLab