diff --git a/Common/Makefile b/Common/Makefile
index 62c551bb42743bd8acc40766bb65685ad496db84..b929ed715031178b3c654084ca452689df29b17f 100644
--- a/Common/Makefile
+++ b/Common/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2001-05-08 16:53:03 geuzaine Exp $
+# $Id: Makefile,v 1.20 2001-05-11 09:13:13 geuzaine Exp $
 #
 # Makefile for "libCommon.a"
 #
@@ -78,8 +78,8 @@ Options.o: Options.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
  ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
  ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
  ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Context.h \
- Const.h Options.h ../Fltk/GUI.h ../Fltk/Opengl_Window.h \
- ../Fltk/Colorbar_Window.h
+ Const.h Options.h ../Fltk/Solvers.h ../Fltk/GUI.h \
+ ../Fltk/Opengl_Window.h ../Fltk/Colorbar_Window.h
 GetOptions.o: GetOptions.cpp Gmsh.h Message.h ../DataStr/Malloc.h \
  ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \
  ../DataStr/Tools.h GmshUI.h GmshVersion.h Const.h Context.h Options.h \
diff --git a/Fltk/Makefile b/Fltk/Makefile
index 76f14c81800364a1fb447af06bf8f7be3f2aa988..ed868e059816b6c666ad2ab4acc4292edfdaa5a8 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.17 2001-05-03 00:09:42 geuzaine Exp $
+# $Id: Makefile,v 1.18 2001-05-11 09:13:15 geuzaine Exp $
 #
 # Makefile for "libFltk.a"
 #
@@ -88,7 +88,7 @@ GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \
  ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \
  ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h GUI.h \
  Opengl_Window.h Colorbar_Window.h Callbacks.h ../Common/Bitmaps.h \
- ../Common/GetOptions.h
+ ../Common/Icon.h ../Common/GetOptions.h
 Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
@@ -98,7 +98,7 @@ Callbacks.o: Callbacks.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../Common/ColorTable.h ../Common/Timer.h ../Geo/Visibility.h \
  ../Graphics/CreateFile.h ../Parser/OpenFile.h ../Common/GetOptions.h \
  ../Common/Context.h ../Common/Options.h GUI.h Opengl_Window.h \
- Colorbar_Window.h Callbacks.h ../Plugin/Plugin.h
+ Colorbar_Window.h Callbacks.h ../Plugin/Plugin.h Solvers.h
 Opengl.o: Opengl.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \
@@ -120,3 +120,12 @@ Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \
  ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \
  ../Common/GmshUI.h GUI.h Opengl_Window.h Colorbar_Window.h \
  ../Common/ColorTable.h ../Common/Context.h ../Common/Const.h
+Socket.o: Socket.cpp ../Common/Message.h
+Solvers.o: Solvers.cpp ../Common/Gmsh.h ../Common/Message.h \
+ ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
+ ../DataStr/avl.h ../DataStr/Tools.h Socket.h ../Parser/OpenFile.h \
+ ../Common/Const.h Solvers.h ../Common/GmshUI.h GUI.h Opengl_Window.h \
+ Colorbar_Window.h ../Common/ColorTable.h ../Mesh/Mesh.h \
+ ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \
+ ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \
+ ../Common/Views.h
diff --git a/Graphics/Makefile b/Graphics/Makefile
index 3737f55750e410843a47dc143807e8529f189481..ee089ef027eb4da03de7b2bd1672a192b9a7640e 100644
--- a/Graphics/Makefile
+++ b/Graphics/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.22 2001-04-23 10:38:12 geuzaine Exp $
+# $Id: Makefile,v 1.23 2001-05-11 09:13:16 geuzaine Exp $
 #
 # Makefile for "libGraphics.a"
 #
@@ -92,7 +92,7 @@ Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \
  ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \
  ../Geo/Verif.h ../Mesh/Interpolation.h ../Mesh/Numeric.h \
- ../Geo/Visibility.h
+ ../Geo/Visibility.h ../Mesh/STL.h
 Post.o: Post.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
  ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \
diff --git a/Mesh/Makefile b/Mesh/Makefile
index 81af6244e71b397ca1eac5701161deac6d836dda..43a4796919f8c50a256a6dcfb507fa1605f1be8c 100644
--- a/Mesh/Makefile
+++ b/Mesh/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.19 2001-04-23 10:38:14 geuzaine Exp $
+# $Id: Makefile,v 1.20 2001-05-11 09:13:17 geuzaine Exp $
 #
 # Makefile for "libMesh.a"
 #
@@ -180,7 +180,8 @@ depend:
  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
  ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
  ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h 3D_Mesh.h ../Adapt/Adapt.h \
- ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Numeric.h
+ ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h 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 ../Common/Const.h ../Geo/Geo.h \
@@ -229,7 +230,7 @@ Read_Mesh.o: Read_Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \
 STL.o: STL.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
  ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h Simplex.h Edge.h \
- ../Geo/ExtrudeParams.h Metric.h
+ ../Geo/ExtrudeParams.h Metric.h STL.h
 SMS.o: SMS.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
  ../DataStr/avl.h ../DataStr/Tools.h ../Geo/Geo.h Mesh.h Vertex.h \
diff --git a/Parser/Makefile b/Parser/Makefile
index 98c8008d00ebfe2e283f5bf3fbc4d0164022b945..49c3d64b15a64ca925d3412ed75714807583e395 100644
--- a/Parser/Makefile
+++ b/Parser/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.20 2001-04-23 10:38:16 geuzaine Exp $
+# $Id: Makefile,v 1.21 2001-05-11 09:13:18 geuzaine Exp $
 #
 # Makefile for "libParser.a"
 #
@@ -77,7 +77,7 @@ Gmsh.tab.o: Gmsh.tab.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../Graphics/Draw.h ../Common/Views.h ../Common/ColorTable.h \
  ../Mesh/Create.h ../Geo/StepGeomDatabase.h ../Common/Options.h \
  ../Common/Colors.h Parser.h OpenFile.h FunctionManager.h \
- ../Common/Timer.h ../Graphics/CreateFile.h
+ ../Common/Timer.h ../Graphics/CreateFile.h ../Mesh/STL.h
 OpenFile.o: OpenFile.cpp ../Common/Gmsh.h ../Common/Message.h \
  ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \
  ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h \