diff --git a/DataStr/Makefile b/DataStr/Makefile
index c036dd37c7639e725306cef38c90a7d76918efc6..f1bb74afcf96f748b431f67aa688fdcd1b1dc44b 100644
--- a/DataStr/Makefile
+++ b/DataStr/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.25 2005-06-03 17:32:29 geuzaine Exp $
+# $Id: Makefile,v 1.26 2005-07-12 15:02:04 remacle Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -55,15 +55,9 @@ 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/Callbacks.cpp b/Fltk/Callbacks.cpp
index 633a2ce993d777385aedf2c5c33aab955f5150b4..84dec148049ef2e000f0bd79d470f4a685f1f144 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.361 2005-07-08 22:07:38 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.362 2005-07-12 15:02:04 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -836,7 +836,8 @@ void wizard_update_edges_cb(CALLBACK_ARGS)
     if (THEM && THEM->bds && WID)
     {
 	const double angle = WID->swiz_value[0]->value() * M_PI / 180;
-	THEM->bds->classify (angle);
+	const int nb       = (int) WID->swiz_value[3]->value();
+	THEM->bds->classify (angle, nb);
 	BDS_To_Mesh (THEM); 
 	char a[25];
 	sprintf(a,"%d",Tree_Nbr(THEM->Points));
@@ -859,7 +860,8 @@ void wizard_update_more_edges_cb(CALLBACK_ARGS)
     if (THEM && THEM->bds && WID)
     {
 	const double angle = WID->swiz_value[2]->value() * M_PI / 180;
-	THEM->bds->classify (angle);
+	const int nb_t  = (int)WID->swiz_value[3]->value() * M_PI / 180;
+	THEM->bds->classify (angle,nb_t);
 	BDS_To_Mesh (THEM); 
 	Draw();
 	n=0;
@@ -890,7 +892,7 @@ void wizard_update_more_edges_cb(CALLBACK_ARGS)
 		Draw(); 
 		Msg(STATUS3N, "Ready");
 		const double angle = WID->swiz_value[0]->value() * M_PI / 180;
-		THEM->bds->classify (angle);
+		THEM->bds->classify (angle,nb_t);
 		BDS_To_Mesh (THEM); 
 		Draw();
 		break;
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index c14e4cfd7fac9dff4b2eb78b0456a4540180484a..8aeb1ed52074c8d0e66179d0dedca5a3f26401fc 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.448 2005-07-08 22:07:38 geuzaine Exp $
+// $Id: GUI.cpp,v 1.449 2005-07-12 15:02:04 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -1618,7 +1618,7 @@ void GUI::create_surface_mesh_wizard(const char *name)
 	surfmesh_filename = name; 
 
     int width = 42 * fontsize;
-    int height = 5 * BH + 5 * WB;
+    int height = 6 * BH + 6 * WB;
 
     if(swiz_window) {	
 	swiz_window->show();
@@ -1669,13 +1669,19 @@ void GUI::create_surface_mesh_wizard(const char *name)
 	    swiz_value[0]->maximum(90);
 	    swiz_value[0]->step(1);
 	    swiz_value[0]->align(FL_ALIGN_RIGHT);
-	    swiz_output[1] = new Fl_Output(2 * WB, 2 * WB + 1 * BH, IW, BH, "Number of Model Vertices");
+	    swiz_value[3] = new Fl_Value_Input(2 * WB, 2 * WB + 1 * BH, IW, BH, "Min nb. of Triangles for plane surface detection");
+	    swiz_value[3]->value(4);
+	    swiz_value[3]->minimum(2);
+	    swiz_value[3]->maximum(30);
+	    swiz_value[3]->step(1);
+	    swiz_value[3]->align(FL_ALIGN_RIGHT);
+	    swiz_output[1] = new Fl_Output(2 * WB, 2 * WB + 2 * BH, IW, BH, "Number of Model Vertices");
 	    swiz_output[1]->align(FL_ALIGN_RIGHT);
 	    swiz_output[1]->value("0");
-	    swiz_output[2] = new Fl_Output(2 * WB, 2 * WB + 2 * BH, IW, BH, "Number of Model Edges");
+	    swiz_output[2] = new Fl_Output(2 * WB, 2 * WB + 3 * BH, IW, BH, "Number of Model Edges");
 	    swiz_output[2]->align(FL_ALIGN_RIGHT);
 	    swiz_output[2]->value("0");
-	    swiz_output[3] = new Fl_Output(2 * WB, 2 * WB + 3 * BH, IW, BH, "Number of Model Faces");
+	    swiz_output[3] = new Fl_Output(2 * WB, 2 * WB + 4 * BH, IW, BH, "Number of Model Faces");
 	    swiz_output[3]->align(FL_ALIGN_RIGHT);
 	    swiz_output[3]->value("0");
 	    {
@@ -1723,7 +1729,7 @@ void GUI::create_surface_mesh_wizard(const char *name)
 	    o->end();
 	}	
 	{
-	    Fl_Group *o = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Reverse Engineering the CAD");
+	    Fl_Group *o = new Fl_Group(WB, WB + BH, width - 2 * WB, height - 2 * WB - BH, "Mesh Generation");
 	    {
 		Fl_Return_Button *b = new Fl_Return_Button(width - 4 * BB - 4 * WB, height - BH - WB, BB, BH, "Apply");
 		b->callback(wizard_update_edges_cb);
diff --git a/Geo/Makefile b/Geo/Makefile
index 16a31bfb6d720ed07b7f68d97247fe1b2e1c1ffd..35c8c52146605a9366ed789057056e30bd7fbbc5 100644
--- a/Geo/Makefile
+++ b/Geo/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.63 2005-06-03 17:32:29 geuzaine Exp $
+# $Id: Makefile,v 1.64 2005-07-12 15:02:04 remacle Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -58,90 +58,59 @@ 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 \
-  ../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 \
+  ../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 ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
+  ../Mesh/Interpolation.h ../Mesh/Create.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 ../DataStr/List.h ../DataStr/Tree.h \
-  ../Numeric/Numeric.h ../Mesh/Vertex.h ../Common/Context.h
-# 1 "/Users/geuzaine/.gmsh/Geo//"
+  ../DataStr/avl.h ../DataStr/Tools.h ../Numeric/Numeric.h \
+  ../Mesh/Vertex.h ../Common/Context.h
 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 ../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/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.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 ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.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 \
-  ../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//"
+  ../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 ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
+  ExtrudeParams.h ../Parser/Parser.h ../Common/Context.h
 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 ../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/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.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 ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.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 ../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 \
+  ../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 ../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//"
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h \
+  ../Mesh/Nurbs.h CAD.h ExtrudeParams.h StepGeomDatabase.h \
+  ../Mesh/Create.h ../Common/Context.h
 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 ../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/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
-  CAD.h ExtrudeParams.h ../Numeric/Numeric.h
-# 1 "/Users/geuzaine/.gmsh/Geo//"
+  ../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 ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h CAD.h \
+  ExtrudeParams.h ../Numeric/Numeric.h
 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 ../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/Vertex.h ../Mesh/Simplex.h ../Mesh/Mesh.h ../Mesh/Matrix.h \
-  CAD.h ExtrudeParams.h ../Numeric/Numeric.h ../Common/Context.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 ../Common/VertexArray.h \
+  ../Common/SmoothNormals.h ../Mesh/Metric.h ../Mesh/Matrix.h CAD.h \
+  ExtrudeParams.h ../Numeric/Numeric.h ../Common/Context.h
diff --git a/MathEval/Makefile b/MathEval/Makefile
index 30d4ac96afb60a30d8608bfcb998a671798b6e49..438f787dfb4278f3d9158f31d50c9c911c511a81 100644
--- a/MathEval/Makefile
+++ b/MathEval/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2005-06-27 19:34:34 geuzaine Exp $
+# $Id: Makefile,v 1.7 2005-07-12 15:02:04 remacle Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -61,19 +61,13 @@ 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.yy.o: scanner.yy.cpp common.h ../DataStr/Malloc.h node.h \
   symbol_table.h parser.tab.hpp
-# 1 "/Users/geuzaine/.gmsh/MathEval//"
 parser.tab.o: parser.tab.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/BDS.cpp b/Mesh/BDS.cpp
index 02f87f38171b50017af5ba3b5b6c8bb4b9cf54d2..1c9e54789ebddd4222106b1d5b678cc29aa650d6 100644
--- a/Mesh/BDS.cpp
+++ b/Mesh/BDS.cpp
@@ -17,9 +17,10 @@ double BDS_Quadric:: normalCurv ( double x, double y, double z ) const
     // K = div n = div ( Grad(f) / ||Grad(f)||)
     //   = Laplacian (f) /  ||Grad(f)|| - Grad^t(f) Hessian Grad(f) / ||Grad(f)||^3
     BDS_Vector g = Gradient ( x , y , z );
-    double normG = sqrt ( g.x*g.x +g.y*g.y +g.z*g.z); 
+    const double normG2 = 1./( g.x*g.x +g.y*g.y +g.z*g.z); 
+    double normG = sqrt ( normG2 );
 
-    double c1 = 2*(a + b + c)/normG;
+    double c1 = 2*(a + b + c);
 
 
     double c2 = 
@@ -31,7 +32,7 @@ double BDS_Quadric:: normalCurv ( double x, double y, double z ) const
 	4*f *  g.y * g.z ;
 
     //printf("%g %g %g %g %g %g\n",a,b,c,normG,c1, c2 / (normG*normG*normG));
-    return fabs(c1 - c2 / (normG*normG*normG));
+    return fabs(c1 - c2 * (normG2) ) * normG;
 }
 
 void BDS_Quadric::projection ( double xa, double ya, double za,
@@ -68,7 +69,7 @@ void BDS_Quadric::projection ( double xa, double ya, double za,
 	    grad.x * g +grad.y * h +grad.z * i;
 	double delta = coef2*coef2 - 4.*coef1*residual;
 	if (delta < 0){
-//	    printf ("aaargh error projection");
+	  //printf ("aaargh error projection delta = %g\n",delta);
 	}
 	else
 	{
@@ -83,7 +84,7 @@ void BDS_Quadric::projection ( double xa, double ya, double za,
 	}
 //	printf("point (%g,%g,%g) ==> (%g,%g,%g) dist %g\n",
 //	       xa,ya,za,x,y,z,signedDistanceTo (x,y,z));;
-	if (ITER++ == 1)	
+	if (ITER++ == 0)	
 	    break;
    }
 }
@@ -265,12 +266,15 @@ BDS_Point *BDS_Mesh :: find_point  (int p)
 
 BDS_Edge *BDS_Mesh :: find_edge  (int num1, int num2)
 {
-    BDS_Point P1 ( num1 ) ;
-    BDS_Point P2 ( num2 ) ;
-    BDS_Edge  E (&P1, &P2);
-    std::set<BDS_Edge*, EdgeLessThan>::iterator it = edges.find(&E);
-    if (it != edges.end()) return (BDS_Edge*) (*it);
-    else return 0;
+  BDS_Point *p = find_point(num1);
+  std::list<BDS_Edge*>::iterator eit  = p->edges.begin(); 
+  while (eit!=p->edges.end())
+    {
+      if ((*eit)->p1 == p && (*eit)->p2->iD == num2)return (*eit);
+      if ((*eit)->p2 == p && (*eit)->p1->iD == num2)return (*eit);
+      ++eit;
+    }
+  return 0;
 }
 
 BDS_Edge *BDS_Mesh :: find_edge  (BDS_Point *p1, BDS_Point *p2, BDS_Triangle *t) const
@@ -293,18 +297,18 @@ BDS_Edge *BDS_Mesh :: add_edge  (int p1, int p2)
     BDS_Point *pp2=find_point(p2);
     if (!pp1 || !pp2)throw;
     BDS_Edge *e = new BDS_Edge ( pp1, pp2 );
-    edges.insert ( e );
+    edges.push_back ( e );
     return e;
 }
 
 BDS_Triangle * BDS_Mesh :: add_triangle  (int p1, int p2, int p3 )
 {
-    add_edge (p1,p2);
-    add_edge (p2,p3);
-    add_edge (p3,p1);
-    BDS_Edge *e1 = find_edge (p1,p2); 
-    BDS_Edge *e2 = find_edge (p2,p3); 
-    BDS_Edge *e3 = find_edge (p3,p1); 
+    BDS_Edge *e1=add_edge (p1,p2);
+    BDS_Edge *e2=add_edge (p2,p3);
+    BDS_Edge *e3=add_edge (p3,p1);
+    //    BDS_Edge *e1 = find_edge (p1,p2); 
+    //    BDS_Edge *e2 = find_edge (p2,p3); 
+    //    BDS_Edge *e3 = find_edge (p3,p1); 
     try {
 	BDS_Triangle *t  = new BDS_Triangle ( e1, e2, e3 );    
 	triangles.push_back ( t );
@@ -324,11 +328,11 @@ void  BDS_Mesh :: del_triangle  (BDS_Triangle *t)
 }
 void  BDS_Mesh :: del_edge  (BDS_Edge *e)
 {
-    edges.erase ( e );
+  //    edges.erase ( e );
     e->p1->del ( e );
     e->p2->del ( e );
     e->deleted = true;
-    edges_to_delete.insert (e);
+    //    edges_to_delete.insert (e);
 }
 void  BDS_Mesh :: del_point  (BDS_Point *p)
 {
@@ -515,7 +519,7 @@ void BDS_Mesh :: reverseEngineerCAD ( )
 						   ((*pit).z-z)*((*pit).z-z));
 //			printf("%g %g %g ... %g %g %g\n",(*pit).x , (*pit).y , (*pit).z ,x,y,z);
 			       
-			if (dist > 1.e-2 * LC )quad = false;
+			if (dist > 1.e-3 * LC )quad = false;
 			++pit;
 		    }		    
 		    if ( quad ) 
@@ -615,12 +619,71 @@ void BDS_Point :: compute_curvature ( )
 	radius_of_curvature = fabs(1/curvature);
       else
 	radius_of_curvature = 1.e22;
-//      printf(" curvature = %g %g %g R = %g\n",wr[0],wr[1],wr[2],radius_of_curvature);
+      //      printf(" R = %g\n",radius_of_curvature);
+  }
+}
+
+void recur_color_plane_surf ( const double eps, 
+			      BDS_Triangle *t , 
+			      const BDS_Vector &n, 
+			      std::set <BDS_Triangle *> &all,
+			      std::list<BDS_Triangle *> &plane)
+{
+  if (all.find (t) == all.end())
+    {
+      BDS_Vector n2 = t->N();
+      double angle = fabs(n2.angle(n));
+      //      printf("triangle %p angle %g\n",t,angle);
+      if (angle < eps)
+	{
+	  all.insert (t);
+	  plane.push_back (t);
+	  if ( t->e1->numfaces() == 2)recur_color_plane_surf (eps,t->e1->otherFace (t) , n, all, plane);
+	  if ( t->e2->numfaces() == 2)recur_color_plane_surf (eps,t->e2->otherFace (t) , n, all, plane);
+	  if ( t->e3->numfaces() == 2)recur_color_plane_surf (eps,t->e3->otherFace (t) , n, all, plane);
+	}
+    }
+}
+
+void BDS_Mesh :: color_plane_surf ( double eps, int NB_T )
+{
+  int current_status = 100000;
+  {
+    std::set<BDS_Triangle*> all;
+    while (1)
+      {
+	std::list<BDS_Triangle*> plane;
+	std::list<BDS_Triangle*>::iterator it  = triangles.begin();
+	std::list<BDS_Triangle*>::iterator ite = triangles.end();
+	BDS_Triangle *start = 0;
+	while (it!=ite)
+	  {
+	    if (all.find(*it) == all.end())
+	      {
+		start = (BDS_Triangle*) (*it);
+	      }
+	    if (start)break;
+	    ++it;
+	  }
+	if (!start)break;	  
+	recur_color_plane_surf ( eps, start , start->N(),all,plane );
+	if (plane.size() > NB_T)
+	  {
+	    printf("plane surface found %d triangles\n",plane.size());
+	    std::list<BDS_Triangle*>::iterator xit  = plane.begin(); 
+	    std::list<BDS_Triangle*>::iterator xite = plane.end();
+	    while (xit != xite)
+	      {
+		(*xit)->status = current_status;
+		++xit;
+	      }
+	      current_status++;
+	  }
+      }
   }
 }
-  
 
-void BDS_Mesh :: classify ( double angle )
+void BDS_Mesh :: classify ( double angle, int NB_T )
 {
 
     printf("  classifying \n");
@@ -628,7 +691,7 @@ void BDS_Mesh :: classify ( double angle )
     static BDS_GeomEntity EDGE_CLAS (0,1);
 
     // clear everything
-    // pre classified meshes will fail to work, more 2 be done
+
     { 
 	{
 	    std::set<BDS_Point*,PointLessThan>::iterator it  = points.begin();
@@ -637,14 +700,18 @@ void BDS_Mesh :: classify ( double angle )
 	}
 
 	{
-	    std::set<BDS_Edge*, EdgeLessThan>::iterator it  = edges.begin();
-	    std::set<BDS_Edge*, EdgeLessThan>::iterator ite = edges.end();
+	    std::list<BDS_Edge*>::iterator it  = edges.begin();
+	    std::list<BDS_Edge*>::iterator ite = edges.end();
 	    while (it != ite){ (*it)->g = 0; ++it;}
 	}
 	{
 	    std::list<BDS_Triangle*>::iterator it  = triangles.begin();
 	    std::list<BDS_Triangle*>::iterator ite = triangles.end();
-	    while (it!=ite){(*it)->g = 0;++it;}
+	    while (it!=ite){
+	      (*it)->g = 0;
+	      if ((*it)->status > 10000)(*it)->status =0;
+	      ++it;
+	    }
 	}
 	geom.clear();
     }
@@ -660,10 +727,14 @@ void BDS_Mesh :: classify ( double angle )
 	}	
     }
 
+    // color plane surfaces
+
+    if (NB_T > 0)color_plane_surf (1.e-4, NB_T);
+
 
     {
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it  = edges.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite = edges.end();
+	std::list<BDS_Edge*>::iterator it  = edges.begin();
+	std::list<BDS_Edge*>::iterator ite = edges.end();
 	while (it!=ite)
 	{
 	    BDS_Edge &e = *((BDS_Edge *) *it);
@@ -747,8 +818,8 @@ void BDS_Mesh :: classify ( double angle )
     int edgetag = 1;
     {
 	std::map< std::pair<int,int> , int > edgetags;
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it  = edges.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite = edges.end();	
+	std::list<BDS_Edge*>::iterator it  = edges.begin();
+	std::list<BDS_Edge*>::iterator ite = edges.end();	
 	while (it!=ite)
 	{
 	    BDS_Edge &e = *((BDS_Edge *) *it);
@@ -1301,8 +1372,8 @@ void BDS_Mesh :: save_gmsh_format ( const char *filename )
 	
 	int nbClasEdges = 0;
 	{
-	    std::set<BDS_Edge*, EdgeLessThan>::iterator it  = edges.begin();
-	    std::set<BDS_Edge*, EdgeLessThan>::iterator ite = edges.end();
+	    std::list<BDS_Edge*>::iterator it  = edges.begin();
+	    std::list<BDS_Edge*>::iterator ite = edges.end();
 	    while(it!=ite)
 	    {
 		if ((*it)->g && (*it)->g->classif_degree == 1)nbClasEdges++;
@@ -1328,8 +1399,8 @@ void BDS_Mesh :: save_gmsh_format ( const char *filename )
 	    }
 	}
 	{
-	    std::set<BDS_Edge*, EdgeLessThan>::iterator it  = edges.begin();
-	    std::set<BDS_Edge*, EdgeLessThan>::iterator ite = edges.end();
+	    std::list<BDS_Edge*>::iterator it  = edges.begin();
+	    std::list<BDS_Edge*>::iterator ite = edges.end();
 	    while(it!=ite)
 	    {
 		if ((*it)->g && (*it)->g->classif_degree == 1)
@@ -1380,26 +1451,40 @@ void DESTROOOY ( IT beg , IT end)
 }
 void BDS_Mesh :: cleanup()
 {
+  {
     for (std::list<BDS_Triangle*> :: iterator it = triangles.begin();
 	 it != triangles.end();
 	 it++)
-    {
+      {
 	while (it != triangles.end() && (*it)->deleted)
-	{
+	  {
 	    delete *it;
 	    it = triangles.erase (it);
-	}
-    }	    
-    DESTROOOY ( edges_to_delete.begin(),edges_to_delete.end());
-    edges_to_delete.clear();
+	  }
+      }	   
+  }
+  { 
+    for (std::list<BDS_Edge*> :: iterator it = edges.begin();
+	 it != edges.end();
+	 it++)
+      {
+	while (it != edges.end() && (*it)->deleted)
+	  {
+	    delete *it;
+	    it = edges.erase (it);
+	  }	
+      }	   
+  } 
+  //    DESTROOOY ( edges_to_delete.begin(),edges_to_delete.end());
+  //    edges_to_delete.clear();
 }
 
 BDS_Mesh ::~ BDS_Mesh ()
 {
     DESTROOOY ( geom.begin(),geom.end());
     DESTROOOY ( points.begin(),points.end());
-    DESTROOOY ( edges.begin(),edges.end());
     cleanup();
+    DESTROOOY ( edges.begin(),edges.end());
     DESTROOOY ( triangles.begin(),triangles.end());
 }
 
@@ -1470,6 +1555,7 @@ bool BDS_Mesh ::split_edge ( BDS_Edge *e, double coord)
     BDS_Edge *p1_op2 = find_edge ( p1, op[1],e->faces(1) );
     BDS_Edge *op2_p2 = find_edge ( op[1],p2,e->faces(1)   );
 
+
     if (e->faces(0))
     {
 	g1 = e->faces(0)->g;
@@ -1483,17 +1569,25 @@ bool BDS_Mesh ::split_edge ( BDS_Edge *e, double coord)
     } 
     
 
+    double t_l = e->target_length;
+
     del_edge (e);
 
 
     BDS_Edge *p1_mid = new BDS_Edge ( p1, mid );
-    edges.insert ( p1_mid );
+    edges.push_back ( p1_mid );
     BDS_Edge *mid_p2 = new BDS_Edge ( mid, p2 );
-    edges.insert ( mid_p2 );
+    edges.push_back ( mid_p2 );
     BDS_Edge *op1_mid = new BDS_Edge ( op[0], mid );
-    edges.insert ( op1_mid );
+    edges.push_back ( op1_mid );
     BDS_Edge *mid_op2 = new BDS_Edge ( mid, op[1] );
-    edges.insert ( mid_op2 );
+    edges.push_back ( mid_op2 );
+
+
+    p1_mid->target_length = t_l; 
+    op1_mid->target_length = t_l; 
+    mid_p2->target_length = t_l; 
+    mid_op2->target_length = t_l; 
 
 //    printf("split ends 1 %d (%d %d) %d %d \n",p1_op1->numfaces(), p1->iD, op[0]->iD, op1_mid->numfaces(),p1_mid->numfaces());
     BDS_Triangle *t1,*t2,*t3,*t4;
@@ -1607,7 +1701,7 @@ bool BDS_Mesh ::swap_edge ( BDS_Edge *e)
     del_edge (e);
 
     BDS_Edge *op1_op2 = new BDS_Edge ( op[0], op[1] );
-    edges.insert ( op1_op2 );
+    edges.push_back ( op1_op2 );
 
     BDS_Triangle*t1,*t2;
     if (orientation == 1)
@@ -1630,7 +1724,7 @@ bool BDS_Mesh ::swap_edge ( BDS_Edge *e)
     triangles.push_back(t2); 
     return true;
 }
-bool BDS_Mesh ::collapse_edge ( BDS_Edge *e, BDS_Point *p, const double eps, const double l)
+bool BDS_Mesh ::collapse_edge ( BDS_Edge *e, BDS_Point *p, const double eps)
 {
 
     if (e->numfaces() != 2)return false;
@@ -1688,7 +1782,6 @@ bool BDS_Mesh ::collapse_edge ( BDS_Edge *e, BDS_Point *p, const double eps, con
 		// are collapsed too
 		double angle = n1.angle(n2);
 		if (fabs(angle) > M_PI/2 )return false;
-		if ( e->length() > 0.1 *l && fabs(angle) > M_PI/4 ) return false;
 		if (s_after < 1.e-2 * s_before)
 		{
 		    return false; 
@@ -1809,26 +1902,7 @@ void project_point_on_a_list_of_triangles ( BDS_Point *p ,
 
 bool BDS_Mesh ::smooth_point_b ( BDS_Point *p  )
 {
-    if (p->g && p->g->classif_degree <= 1)return false;
-    
-    std::list<BDS_Edge*>::iterator eit  = p->edges.begin(); 
-
-    double l_max  = 0;
-    BDS_Edge *e_max;
-
-    while (eit!=p->edges.end())
-    {
-	++eit;
-    }
-
-    if (p->g->surf)
-    {
-	p->g->surf->projection ( p->X,p->Y,p->Z,p->X,p->Y,p->Z);
-//	printf("coucou\n");
-    }
-    else
-    {
-    }
+  throw;
 }
 
 bool BDS_Mesh ::smooth_point ( BDS_Point *p , BDS_Mesh *geom_mesh )
@@ -1862,73 +1936,147 @@ bool BDS_Mesh ::smooth_point ( BDS_Point *p , BDS_Mesh *geom_mesh )
     }
     else
     {
-	return false;
+      //	return false;
 	p->X = X;
 	p->Y = Y;
 	p->Z = Z;
-	std::list<BDS_Triangle *>t;
-	p->getTriangles (t);
-	project_point_on_a_list_of_triangles ( p , t, p->X,p->Y,p->Z);	
-	if (geom_mesh)
-	    project_point_on_a_list_of_triangles ( p , geom_mesh->triangles, p->X,p->Y,p->Z);
+	//	std::list<BDS_Triangle *>t;
+	//	p->getTriangles (t);
+	//	project_point_on_a_list_of_triangles ( p , t, p->X,p->Y,p->Z);	
+	if (p->g && geom_mesh)
+	  {
+	    BDS_GeomEntity *gg = geom_mesh->get_geom(p->g->classif_tag,p->g->classif_degree);
+	    project_point_on_a_list_of_triangles ( p , gg->t, p->X,p->Y,p->Z);
+	  }
     }
     return true;
 }
+
+void BDS_Mesh :: compute_metric_edge_lengths (const BDS_Metric & metric)
+{
+
+  //  printf("computation of metric lengths\n");
+  {
+    std::list<BDS_Edge*>::iterator it = edges.begin();
+    std::list<BDS_Edge*>::iterator ite  = edges.end();
+    while (it != ite)
+      {
+	if (!(*it)->deleted)
+	  {
+	    (*it)->target_length = metric.target_length (  0.5*((*it)->p2->X+(*it)->p1->X),
+							   0.5*((*it)->p2->Y+(*it)->p1->Y),
+							   0.5*((*it)->p2->Z+(*it)->p1->Z));
+	  }
+	++it;
+      }
+  }
+  //  printf("computation of curvatures\n");
+  {
+    std::set<BDS_Point*, PointLessThan>::iterator it   = points.begin();
+    std::set<BDS_Point*, PointLessThan>::iterator ite  = points.end();
+    while (it != ite)
+      {	
+	if ((*it)->g && !(*it)->g->surf)
+	  (*it)->compute_curvature ();
+	++it;
+      }
+  }
+
+
+  { 
+    std::list<BDS_Edge*>::iterator it = edges.begin();
+    std::list<BDS_Edge*>::iterator ite  = edges.end();
+    while (it != ite)
+      {
+	BDS_Edge *e = (*it);
+	BDS_GeomEntity *g = e->g;
+	if(g && g->surf)
+	  {	    	   
+	    double curvature = g->surf->normalCurv (0.5*(e->p1->X+e->p2->X),
+						    0.5*(e->p1->Y+e->p2->Y),
+						    0.5*(e->p1->Z+e->p2->Z));
+	    double radius = 1./curvature;
+	    double target = radius  /  5.0;
+	    e->target_length = metric.update_target_length (target,e->target_length);
+	    //		printf("e1 radius %g target %g length %g mlp %g ml %g\n",radius, target,e->length(),e->length()/target,e->metric_length);
+	  }
+	else
+	  {
+	    	    double radius = 1/(0.5*(1/e->p1->radius_of_curvature+1/e->p2->radius_of_curvature));
+	    	    double target = radius  /  5.0;
+	    	    e->target_length = metric.update_target_length (target,e->target_length);
+	    
+	  }
+	++it;
+      }
+  }
+  //  printf("smoothing\n");
+  const int NITER = 3;
+  for (int I=0;I<NITER;++I)  {     
+    const double BETA = 0.9;
+    std::set<BDS_Point*, PointLessThan>::iterator it   = points.begin();
+    std::set<BDS_Point*, PointLessThan>::iterator ite  = points.end();
+    while (it != ite)
+      {
+	
+	std::list<BDS_Edge*>::iterator eit  = (*it)->edges.begin(); 
+	
+	double l_min  = metric._max;
+	
+	while (eit!=(*it)->edges.end())
+	  {
+	    if (l_min > (*eit)->target_length)l_min =  (*eit)->target_length;
+	    ++eit;
+	  }
+	
+	l_min /= BETA;
+
+	eit  = (*it)->edges.begin(); 
+	while (eit!=(*it)->edges.end())
+	  {
+	    if ((*eit)->target_length > l_min)(*eit)->target_length = l_min;
+	    ++eit;
+	  }
+	++it;
+      }
+  }
+
+  //  printf("end computation of metric lengths\n");
+}
     
 int BDS_Mesh :: adapt_mesh ( double l, bool smooth, BDS_Mesh *geom_mesh) 
 {
     int nb_modif = 0;
 
-    double CURV_FACTOR = 5;
+    BDS_Metric metric ( l , LC/200 , LC );
+    //    printf("METRIC %g %g %g\n",LC,metric._min,metric._max);
 
     // add initial set of edges in a list
-    std::set<BDS_Edge*, EdgeLessThan> small_to_long;
+    std::list<BDS_Edge*> small_to_long;
     {
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it = edges.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite  = edges.end();
+	std::list<BDS_Edge*>::iterator it = edges.begin();
+	std::list<BDS_Edge*>::iterator ite  = edges.end();
 	while (it != ite)
 	{
 	  //	    if ((*it)->numfaces()==1)printf("one face\n");
-	    small_to_long.insert (*it);  
+	    small_to_long.push_back (*it);  
 	    ++it;
 	}
     }
     // split edges
     {
-      std::set<BDS_Edge*, EdgeLessThan>::iterator it = small_to_long.begin();
-      std::set<BDS_Edge*, EdgeLessThan>::iterator ite  = small_to_long.end();
+      std::list<BDS_Edge*>::iterator it = small_to_long.begin();
+      std::list<BDS_Edge*>::iterator ite  = small_to_long.end();
+      compute_metric_edge_lengths (metric);
             
       while (it != ite)
 	{
 	  if ((*it)->numfaces()==2)
 	    {
-	      BDS_Point *op[2];
-	      (*it)->oppositeof (op);
-	      double ll = sqrt((op[0]->X-op[1]->X)*(op[0]->X-op[1]->X)+
-			       (op[0]->Y-op[1]->Y)*(op[0]->Y-op[1]->Y)+
-			       (op[0]->Z-op[1]->Z)*(op[0]->Z-op[1]->Z));
-	      double LLL = l;
-
-	      if ((*it)->g && (*it)->g->classif_degree == 2 &&(*it)->g->surf)
-	      {
-		  double curvature = (*it)->g->surf->normalCurv (0.5*((*it)->p1->X+(*it)->p2->X),
-								 0.5*((*it)->p1->Y+(*it)->p2->Y),
-								 0.5*((*it)->p1->Z+(*it)->p2->Z));
-		  if (curvature > 0.0)
-		  {
-
-		      double radius_of_curvature = 1./curvature;
-//		      printf("surface %d radius %g\n",(*it)->g->classif_tag,radius_of_curvature);
-		      double maxL = radius_of_curvature / CURV_FACTOR;
-
-		      if ( LLL > maxL ) LLL = maxL;
-		  }
-	      }
-
-	      if (!(*it)->deleted && (*it)->length() > LLL/0.7 && ll > 0.25 * LLL){
-//		  printf("we schpilt\n");
-		  split_edge (*it, 0.5 );
-		  nb_modif++;
+	      double length = (*it)->length();
+	      if (!(*it)->deleted && length > (*it)->target_length / 0.7 ){
+		split_edge (*it, 0.5 );
+		nb_modif++;
 	      }
 	    }
 	  ++it;
@@ -1939,64 +2087,52 @@ int BDS_Mesh :: adapt_mesh ( double l, bool smooth, BDS_Mesh *geom_mesh)
     cleanup();    
     {
 	small_to_long.clear();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it = edges.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite  = edges.end();
+	std::list<BDS_Edge*>::iterator it = edges.begin();
+	std::list<BDS_Edge*>::iterator ite  = edges.end();
 	while (it != ite)
 	{
-	    small_to_long.insert (*it);  
+	    small_to_long.push_back (*it);  
 	    ++it;
 	}
     }
     // collapse 
     {    	
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it = small_to_long.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite  = small_to_long.end();
+	std::list<BDS_Edge*>::iterator it = small_to_long.begin();
+	std::list<BDS_Edge*>::iterator ite  = small_to_long.end();
+	//	compute_metric_edge_lengths (metric);
+
 	while (it != ite)
 	{
-
-	    double LLL = l;
-	    if ((*it)->g && (*it)->g->classif_degree == 2 &&(*it)->g->surf)
-	    {
-		double curvature = (*it)->g->surf->normalCurv (0.5*((*it)->p1->X+(*it)->p2->X),
-							       0.5*((*it)->p1->Y+(*it)->p2->Y),
-							       0.5*((*it)->p1->Z+(*it)->p2->Z));
-		if (curvature > 0.0)
-		{
-		    double radius_of_curvature = 1./curvature;
-		    double maxL = radius_of_curvature / CURV_FACTOR;
-		    if ( LLL > maxL ) LLL = maxL;
-		}
-	    }
-
-	    if (!(*it)->deleted && (*it)->length() < 0.7 * LLL ){
-		if (nb_modif %2 )
-		{
-		    if (collapse_edge (*it, (*it)->p1, 0.1,LLL ))
-			nb_modif++;
-		}
-		else
-		{
-		    if (collapse_edge (*it, (*it)->p2, 0.1,LLL ))
-			nb_modif++;
-		}
-	    }
-	    ++it;
+	  double length = (*it)->length();
+	  if (!(*it)->deleted && length < (*it)->target_length * 0.7 ){
+	    if (nb_modif %2 )
+	      {
+		if (collapse_edge (*it, (*it)->p1, 0.1 ))
+		  nb_modif++;
+	      }
+	    else
+	      {
+		if (collapse_edge (*it, (*it)->p2, 0.1 ))
+		  nb_modif++;
+	      }
+	  }
+	  ++it;
 	}
     }
     cleanup();  
     {
 	small_to_long.clear();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it = edges.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite  = edges.end();
+	std::list<BDS_Edge*>::iterator it = edges.begin();
+	std::list<BDS_Edge*>::iterator ite  = edges.end();
 	while (it != ite)
 	{
-	    small_to_long.insert (*it);  
+	    small_to_long.push_back (*it);  
 	    ++it;
 	}
     }
     {    
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it = small_to_long.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite  = small_to_long.end();
+	std::list<BDS_Edge*>::iterator it = small_to_long.begin();
+	std::list<BDS_Edge*>::iterator ite  = small_to_long.end();
 	while (it != ite)
 	{
 	    if (!(*it)->deleted && (*it)->numfaces()==2)
@@ -2061,7 +2197,12 @@ int BDS_Mesh :: adapt_mesh ( double l, bool smooth, BDS_Mesh *geom_mesh)
 BDS_Mesh::BDS_Mesh (const BDS_Mesh &other)
 {
     MAXPOINTNUMBER = other.MAXPOINTNUMBER;
-
+    LC = other.LC;
+    for (int i=0;i<3;i++)
+      {
+	Min[i] = other.Min[i];
+	Max[i] = other.Max[i];
+      }
     for (std::set<BDS_GeomEntity*,GeomLessThan>::const_iterator it = other.geom.begin();
 	 it != other.geom.end();
 	 ++it)
@@ -2080,7 +2221,7 @@ BDS_Mesh::BDS_Mesh (const BDS_Mesh &other)
 	if (p->g->classif_degree == 0)
 	    p->g->p = p;
     }
-    for ( std::set<BDS_Edge*, EdgeLessThan>::const_iterator it  = other.edges.begin();
+    for ( std::list<BDS_Edge*>::const_iterator it  = other.edges.begin();
 	  it != other.edges.end();
 	  ++it)
     {
diff --git a/Mesh/BDS.h b/Mesh/BDS.h
index 7cec3b27d9dc3bb4d516258340fd61b947fb42d4..33d648913127fdbea150c180282a885882f2fc8e 100644
--- a/Mesh/BDS.h
+++ b/Mesh/BDS.h
@@ -16,6 +16,28 @@ class BDS_Triangle;
 class BDS_Mesh;
 class BDS_Point;
 
+class BDS_Metric
+{
+ public:
+  const double target,_min,_max,treshold;
+  BDS_Metric ( double _target , double _mmin, double _mmax, double _tres = 0.7) 
+    : target(_target),_min(_mmin),_max(_mmax),treshold(_tres)
+    {}
+  inline double update_target_length( double _target, double old_target_length  ) const
+    {
+      if (_target <= _min) return _min;
+      if (_target >= _max) return _max;
+      if (old_target_length > _target)return _target ;
+      return old_target_length;
+
+    }
+  inline double target_length( double x, double y, double z ) const
+    {
+      return target;
+    }
+};
+
+
 class BDS_Surface
 {
 public :
@@ -188,6 +210,7 @@ class BDS_Edge
 public:
     bool deleted;
     int status;
+    double target_length;
     BDS_Point *p1,*p2;
     BDS_GeomEntity *g;
     inline BDS_Triangle* faces(int i) const
@@ -244,7 +267,7 @@ public:
     inline void oppositeof (BDS_Point * oface[2]) const; 
 
     BDS_Edge ( BDS_Point *A, BDS_Point *B )
-	: deleted(false), status(0),g(0)
+      : deleted(false), status(0),target_length(1.0),g(0)
 	{	    
 	    if (*A < *B) 
 	    {
@@ -412,8 +435,7 @@ class BDS_Mesh
     BDS_Mesh (const BDS_Mesh &other);
     std::set<BDS_GeomEntity*,GeomLessThan> geom; 
     std::set<BDS_Point*,PointLessThan>     points; 
-    std::set<BDS_Edge*, EdgeLessThan>      edges; 
-    std::set<BDS_Edge*>                    edges_to_delete; 
+    std::list<BDS_Edge*>      edges; 
     std::list<BDS_Triangle*>   triangles; 
     BDS_Point * add_point (int num , double x, double y,double z);
     BDS_Edge  * add_edge  (int p1, int p2);
@@ -427,13 +449,15 @@ class BDS_Mesh
     BDS_Edge  *find_edge (BDS_Point *p1, BDS_Point *p2, BDS_Triangle *t)const;
     BDS_GeomEntity *get_geom  (int p1, int p2);
     bool swap_edge ( BDS_Edge *);
-    bool collapse_edge ( BDS_Edge *, BDS_Point*, const double eps, const double l);
+    bool collapse_edge ( BDS_Edge *, BDS_Point*, const double eps);
     bool smooth_point   ( BDS_Point* , BDS_Mesh *geom = 0);
     bool smooth_point_b ( BDS_Point* );
     bool split_edge ( BDS_Edge *, double coord);
-    void classify ( double angle);
+    void classify ( double angle, int nb = -1); 
+    void color_plane_surf ( double eps , int nb);
     void reverseEngineerCAD ( ) ;
-    int adapt_mesh(double,bool smooth = false,BDS_Mesh *geom = 0);
+    int adapt_mesh(double,bool smooth = false,BDS_Mesh *geom = 0); 
+    void compute_metric_edge_lengths (const BDS_Metric & metric);
     void cleanup();
     // io's 
     // STL
diff --git a/Mesh/DiscreteSurface.cpp b/Mesh/DiscreteSurface.cpp
index 12c9cd8643735c346c4afe57f884e0335e9dcd37..05d68834405b812ec685e893716152960e7d6e27 100644
--- a/Mesh/DiscreteSurface.cpp
+++ b/Mesh/DiscreteSurface.cpp
@@ -1,4 +1,4 @@
-// $Id: DiscreteSurface.cpp,v 1.19 2005-07-07 20:44:47 geuzaine Exp $
+// $Id: DiscreteSurface.cpp,v 1.20 2005-07-12 15:01:17 remacle Exp $
 //
 // Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 //
@@ -81,8 +81,8 @@ void BDS_To_Mesh_2(Mesh *m)
     }
 
     {
-	std::set<BDS_Edge*, EdgeLessThan>::iterator it  = m->bds_mesh->edges.begin();
-	std::set<BDS_Edge*, EdgeLessThan>::iterator ite = m->bds_mesh->edges.end();
+	std::list<BDS_Edge*>::iterator it  = m->bds_mesh->edges.begin();
+	std::list<BDS_Edge*>::iterator ite = m->bds_mesh->edges.end();
 	while(it!=ite)
 	{
 	    BDS_GeomEntity *g = (*it)->g;
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 00f8514bc6283bde2cfbc7a2a4b51f0e2cd162b4..a2e6f99d556be718fd3649c2d7e6870535803e2a 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.89 2005-07-03 08:02:24 geuzaine Exp $
+# $Id: Makefile,v 1.90 2005-07-12 15:01:17 remacle Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -102,410 +102,294 @@ 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 ../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 \
+  ../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 ../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 ../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 \
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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 \
+  ../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 ../Common/VertexArray.h \
   ../Common/SmoothNormals.h Metric.h Matrix.h Interpolation.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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../DataStr/List.h ../DataStr/Tree.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Interpolation.h Vertex.h Mesh.h 2D_Mesh.h Create.h \
+  ../Common/Context.h
 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 ../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 \
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.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 ../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//"
+  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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 \
+  ../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 ../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 ../DataStr/List.h ../DataStr/Tree.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.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 ../DataStr/List.h ../DataStr/Tree.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.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//"
+  ../Common/Views.h ../Common/ColorTable.h ../Common/GmshMatrix.h \
+  ../Common/AdaptiveViews.h ../Numeric/Numeric.h ../Common/Context.h
 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 ../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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h ../Common/Context.h Create.h Vertex.h
 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 ../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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h ../Common/Context.h Create.h Vertex.h
 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 ../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 \
+  ../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 ../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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 3D_Mesh_Tetgen.o: 3D_Mesh_Tetgen.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 BDS.o: BDS.cpp BDS.h ../Numeric/Numeric.h ../Common/GmshMatrix.h \
   ../Numeric/EigSolve.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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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.o: Create.cpp ../Common/Gmsh.h ../Common/Message.h \
   ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h Utils.h Vertex.h ../Common/Context.h Create.h
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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/GmshMatrix.h ../Common/AdaptiveViews.h
 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 ../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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h Create.h Vertex.h ../Common/Context.h
 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 ../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 ../Numeric/Numeric.h ../Common/Context.h
-# 1 "/Users/geuzaine/.gmsh/Mesh//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h 3D_Mesh.h Create.h Vertex.h ../Geo/MinMax.h \
+  ../Numeric/Numeric.h ../Common/Context.h
 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 ../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 \
+  ../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 ../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//"
+  ../Mesh/Vertex.h ../Geo/Geo.h Create.h Interpolation.h \
+  ../Common/Context.h BDS.h
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h Interpolation.h Vertex.h ../Common/Context.h
 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 ../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//"
+  ../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 \
+  ../Common/VertexArray.h ../Common/SmoothNormals.h ../Mesh/Metric.h \
+  ../Mesh/Matrix.h Mesh.h Matrix.h Interpolation.h Vertex.h
 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 ../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 \
+  ../DataStr/avl.h ../DataStr/Tools.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//"
+  ../Geo/GeoUtils.h ../Mesh/Mesh.h Create.h ../Geo/CAD.h ../Mesh/Vertex.h
 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 ../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 \
+  ../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 ../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//"
+  ../Mesh/Vertex.h Utils.h Interpolation.h
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 ../DataStr/List.h ../DataStr/Tree.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.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 ../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//"
+  ../DataStr/avl.h ../DataStr/Tools.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
 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 \
-  ../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//"
+  ../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
 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 \
-  ../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//"
+  ../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
 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 ../DataStr/List.h ../DataStr/Tree.h \
-  Mesh.h Vertex.h Element.h Simplex.h Face.h Edge.h \
-  ../Geo/ExtrudeParams.h ../Common/VertexArray.h \
+  ../DataStr/avl.h ../DataStr/Tools.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 ../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 \
+  ../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 ../Common/VertexArray.h \
   ../Common/SmoothNormals.h Metric.h Matrix.h ../Common/Context.h
diff --git a/Netgen/Makefile b/Netgen/Makefile
index 384c479c4fa971837281d083ab790bc35c173d50..e79d0dba7fba0542c35f42ac1220bebc1c8b6607 100644
--- a/Netgen/Makefile
+++ b/Netgen/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.11 2005-06-20 18:02:51 geuzaine Exp $
+# $Id: Makefile,v 1.12 2005-07-12 15:02:04 remacle Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -148,100 +148,72 @@ 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/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//"
+  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
 bfgs.o: libsrc/opti/bfgs.cpp libsrc/include/mystdlib.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/opti/opti.hpp
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 linsearch.o: libsrc/opti/linsearch.cpp libsrc/include/mystdlib.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/opti/opti.hpp
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 global.o: libsrc/meshing/global.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -254,37 +226,27 @@ 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/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/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 \
@@ -297,37 +259,27 @@ 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/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/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 \
@@ -339,55 +291,39 @@ 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/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//"
+  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
 refine.o: libsrc/meshing/refine.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -400,37 +336,27 @@ 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/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/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 \
@@ -443,37 +369,27 @@ 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/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/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 \
@@ -485,38 +401,28 @@ 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/include/../opti/opti.hpp
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  libsrc/meshing/specials.hpp
 smoothing3.o: libsrc/meshing/smoothing3.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -528,38 +434,28 @@ 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/include/../opti/opti.hpp
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  libsrc/meshing/specials.hpp
 adfront3.o: libsrc/meshing/adfront3.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -572,45 +468,31 @@ 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/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/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 \
@@ -623,37 +505,27 @@ 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/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/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 \
@@ -666,37 +538,27 @@ 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/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/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 \
@@ -709,37 +571,27 @@ 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/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/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 \
@@ -751,38 +603,28 @@ 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/include/../opti/opti.hpp
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  libsrc/meshing/specials.hpp
 smoothing2.o: libsrc/meshing/smoothing2.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -794,38 +636,28 @@ 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/include/../opti/opti.hpp
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  libsrc/meshing/specials.hpp
 adfront2.o: libsrc/meshing/adfront2.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -838,37 +670,27 @@ 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/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/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 \
@@ -881,39 +703,28 @@ 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/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/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 \
@@ -926,37 +737,27 @@ 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/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/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 \
@@ -969,37 +770,27 @@ 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/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/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 \
@@ -1012,37 +803,27 @@ 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/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/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 \
@@ -1055,37 +836,27 @@ 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/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/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 \
@@ -1098,39 +869,28 @@ 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/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/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 \
@@ -1143,37 +903,27 @@ 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/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/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 \
@@ -1186,37 +936,27 @@ 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/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/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 \
@@ -1229,37 +969,27 @@ 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/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/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 \
@@ -1272,37 +1002,27 @@ 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/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/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 \
@@ -1315,37 +1035,27 @@ 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/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/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 \
@@ -1357,38 +1067,28 @@ 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/include/../opti/opti.hpp
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  libsrc/meshing/specials.hpp
 delaunay.o: libsrc/meshing/delaunay.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -1401,135 +1101,93 @@ 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/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//"
+  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
 msghandler.o: libsrc/meshing/msghandler.cpp libsrc/include/meshing.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//"
+  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
 meshfunc2d.o: libsrc/meshing/meshfunc2d.cpp libsrc/include/mystdlib.h \
   libsrc/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/meshing/msghandler.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 \
@@ -1542,37 +1200,27 @@ 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/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/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 \
@@ -1585,37 +1233,27 @@ 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/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/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 \
@@ -1628,37 +1266,27 @@ 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/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/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 \
@@ -1671,37 +1299,27 @@ 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/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/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 \
@@ -1714,37 +1332,27 @@ 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/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/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 \
@@ -1759,2654 +1367,1628 @@ 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/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//"
+  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
 geomtest3d.o: libsrc/gprim/geomtest3d.cpp libsrc/include/mystdlib.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/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//"
+  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
 geom2d.o: libsrc/gprim/geom2d.cpp libsrc/include/mystdlib.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/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//"
+  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
 geom3d.o: libsrc/gprim/geom3d.cpp libsrc/include/mystdlib.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/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//"
+  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
 adtree.o: libsrc/gprim/adtree.cpp libsrc/include/mystdlib.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/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//"
+  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
 transform3d.o: libsrc/gprim/transform3d.cpp libsrc/include/mystdlib.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/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//"
+  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
 geomfuncs.o: libsrc/gprim/geomfuncs.cpp libsrc/include/mystdlib.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/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//"
+  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
 polynomial.o: libsrc/linalg/polynomial.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 densemat.o: libsrc/linalg/densemat.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 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/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//"
+  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
 brick.o: libsrc/csg/brick.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 manifold.o: libsrc/csg/manifold.cpp libsrc/include/csg.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//"
+  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
 bspline2d.o: libsrc/csg/bspline2d.cpp 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//"
+  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
 meshsurf.o: libsrc/csg/meshsurf.cpp 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//"
+  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
 csgeom.o: libsrc/csg/csgeom.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 polyhedra.o: libsrc/csg/polyhedra.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 curve2d.o: libsrc/csg/curve2d.cpp libsrc/include/mystdlib.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/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//"
+  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
 singularref.o: libsrc/csg/singularref.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 edgeflw.o: libsrc/csg/edgeflw.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 solid.o: libsrc/csg/solid.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 explicitcurve2d.o: libsrc/csg/explicitcurve2d.cpp \
-  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//"
+  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
 specpoin.o: libsrc/csg/specpoin.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 gencyl.o: libsrc/csg/gencyl.cpp libsrc/include/linalg.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//"
+  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
 revolution.o: libsrc/csg/revolution.cpp libsrc/include/mystdlib.h \
-  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//"
+  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
 genmesh.o: libsrc/csg/genmesh.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 spline3d.o: libsrc/csg/spline3d.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 surface.o: libsrc/csg/surface.cpp libsrc/include/mystdlib.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/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//"
+  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
 identify.o: libsrc/csg/identify.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 triapprox.o: libsrc/csg/triapprox.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 geom2dmesh.o: libsrc/geom2d/geom2dmesh.cpp 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/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//"
+  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
 spline2d.o: libsrc/geom2d/spline2d.cpp 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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 splinegeometry2.o: libsrc/geom2d/splinegeometry2.cpp \
-  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//"
+  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
 genmesh2d.o: libsrc/geom2d/genmesh2d.cpp 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/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//"
+  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
 meshstlsurface.o: libsrc/stlgeom/meshstlsurface.cpp \
   libsrc/include/mystdlib.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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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//"
+  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
 ngexception.o: libsrc/general/ngexception.cpp 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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 table.o: libsrc/general/table.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 optmem.o: libsrc/general/optmem.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 spbita2d.o: libsrc/general/spbita2d.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 hashtabl.o: libsrc/general/hashtabl.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 sort.o: libsrc/general/sort.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 flags.o: libsrc/general/flags.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 seti.o: libsrc/general/seti.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 bitarray.o: libsrc/general/bitarray.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 array.o: libsrc/general/array.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 symbolta.o: libsrc/general/symbolta.cpp libsrc/include/mystdlib.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
-# 1 "/Users/geuzaine/.gmsh/Netgen//"
+  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
 mystring.o: libsrc/general/mystring.cpp libsrc/include/mystdlib.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/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//"
+  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
 nglib_addon.o: nglib_addon.cpp libsrc/include/meshing.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 libsrc/interface/nglib.h \
-  ../Common/Message.h
+  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
diff --git a/Numeric/Makefile b/Numeric/Makefile
index cb77f38b70f79bdc5299ae3127440bbf04b43721..372d84206e668a06c902976a8556a339814209aa 100644
--- a/Numeric/Makefile
+++ b/Numeric/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2005-06-03 17:32:30 geuzaine Exp $
+# $Id: Makefile,v 1.20 2005-07-12 15:02:04 remacle Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -53,20 +53,13 @@ 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 ../DataStr/List.h ../DataStr/Tree.h \
-  Numeric.h
-# 1 "/Users/geuzaine/.gmsh/Numeric//"
+  ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
 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 ../DataStr/List.h ../DataStr/Tree.h \
-  Numeric.h
-# 1 "/Users/geuzaine/.gmsh/Numeric//"
+  ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
 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 ../DataStr/List.h ../DataStr/Tree.h \
-  Numeric.h
+  ../DataStr/avl.h ../DataStr/Tools.h Numeric.h
diff --git a/Parallel/Makefile b/Parallel/Makefile
index 7c553d082b0cf05b2958ffa6e7290620449b17b2..1aca4bf8b652b65b9abcdf6cc44b453de1857f2a 100644
--- a/Parallel/Makefile
+++ b/Parallel/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.18 2005-06-03 17:32:30 geuzaine Exp $
+# $Id: Makefile,v 1.19 2005-07-12 15:02:05 remacle Exp $
 #
 # Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
 #
@@ -50,5 +50,4 @@ depend:
 	rm -f Makefile.new
 
 # DO NOT DELETE THIS LINE
-# 1 "/Users/geuzaine/.gmsh/Parallel//"
 ParUtil.o: ParUtil.cpp ParUtil.h