From 86ea6c3f37cd638f7f945f018bf5dc90d387e303 Mon Sep 17 00:00:00 2001 From: Jean-Francois Remacle <jean-francois.remacle@uclouvain.be> Date: Tue, 7 Aug 2001 21:00:43 +0000 Subject: [PATCH] *** empty log message *** --- Adapt/Makefile | 16 +-- {Graphics => Common}/Iso.cpp | 2 +- {Graphics => Common}/Iso.h | 0 Common/Makefile | 32 +----- DataStr/Makefile | 7 +- Fltk/Makefile | 68 +---------- Geo/Makefile | 51 +-------- Graphics/Makefile | 97 +--------------- Makefile | 10 +- Mesh/Makefile | 211 +---------------------------------- Motif/Makefile | 116 +------------------ Parser/Makefile | 27 +---- Plugin/Makefile | 14 +-- Plugin/Plugin.cpp | 9 +- jpeg/Makefile | 42 +------ 15 files changed, 25 insertions(+), 677 deletions(-) rename {Graphics => Common}/Iso.cpp (99%) rename {Graphics => Common}/Iso.h (100%) diff --git a/Adapt/Makefile b/Adapt/Makefile index 88bcd2685b..45152d7f70 100644 --- a/Adapt/Makefile +++ b/Adapt/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.17 2001-07-30 15:39:53 geuzaine Exp $ +# $Id: Makefile,v 1.18 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libAdapt.a" # @@ -58,17 +58,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -Adapt.o: Adapt.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h Adapt.h nrutil.h \ - ../Common/Const.h -mnbrak.o: mnbrak.cpp nrutil.h ../Common/Const.h -brent.o: brent.cpp nrutil.h ../Common/Const.h -nrutil.o: nrutil.cpp -dsvdcmp.o: dsvdcmp.cpp nrutil.h ../Common/Const.h -newt.o: newt.cpp nrutil.h ../Common/Const.h -fmin.o: fmin.cpp nrutil.h ../Common/Const.h -fdjac.o: fdjac.cpp nrutil.h ../Common/Const.h -lnsrch.o: lnsrch.cpp nrutil.h ../Common/Const.h -lubksb.o: lubksb.cpp -ludcmp.o: ludcmp.cpp nrutil.h ../Common/Const.h diff --git a/Graphics/Iso.cpp b/Common/Iso.cpp similarity index 99% rename from Graphics/Iso.cpp rename to Common/Iso.cpp index 7708ff1df2..b81aed07b6 100644 --- a/Graphics/Iso.cpp +++ b/Common/Iso.cpp @@ -1,4 +1,4 @@ -// $Id: Iso.cpp,v 1.9 2001-03-10 19:55:07 remacle Exp $ +// $Id: Iso.cpp,v 1.1 2001-08-07 21:00:43 remacle Exp $ #include "Gmsh.h" #include "Mesh.h" diff --git a/Graphics/Iso.h b/Common/Iso.h similarity index 100% rename from Graphics/Iso.h rename to Common/Iso.h diff --git a/Common/Makefile b/Common/Makefile index c9010b39b2..32c98d3395 100644 --- a/Common/Makefile +++ b/Common/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.22 2001-07-30 15:39:56 geuzaine Exp $ +# $Id: Makefile,v 1.23 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libCommon.a" # @@ -28,6 +28,7 @@ CFLAGS = $(C_FLAGS) $(OS_FLAGS) $(VERSION_FLAGS) $(INCLUDE)\ SRC = Context.cpp\ Views.cpp\ + Iso.cpp\ Options.cpp\ GetOptions.cpp\ Timer.cpp\ @@ -62,32 +63,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -Context.o: Context.cpp Gmsh.h Message.h ../DataStr/Malloc.h \ - ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \ - ../DataStr/Tools.h Const.h ../Geo/Geo.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 ../Common/Const.h ../Common/ColorTable.h Context.h \ - Options.h DefaultOptions.h trackball.c trackball.h -Views.o: Views.cpp Gmsh.h Message.h ../DataStr/Malloc.h \ - ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \ - ../DataStr/Tools.h Views.h Const.h ColorTable.h Context.h Options.h -Options.o: Options.cpp Gmsh.h Message.h ../DataStr/Malloc.h \ - ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \ - ../DataStr/Tools.h GmshUI.h ../Geo/Geo.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 ../Common/Const.h ../Common/ColorTable.h Context.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 \ - ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Views.h \ - ColorTable.h ../Parser/OpenFile.h ../Common/Const.h \ - ../Parser/Parser.h -Timer.o: Timer.cpp -ColorTable.o: ColorTable.cpp Gmsh.h Message.h ../DataStr/Malloc.h \ - ../DataStr/List.h ../DataStr/Tree.h ../DataStr/avl.h \ - ../DataStr/Tools.h ColorTable.h Context.h Const.h diff --git a/DataStr/Makefile b/DataStr/Makefile index 7646044410..20e789947a 100644 --- a/DataStr/Makefile +++ b/DataStr/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.7 2001-07-30 15:39:57 geuzaine Exp $ +# $Id: Makefile,v 1.8 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libDataStr.a" # @@ -52,8 +52,3 @@ depend: # DO NOT DELETE THIS LINE -List.o: List.cpp Malloc.h List.h ../Common/Message.h -Malloc.o: Malloc.cpp Malloc.h ../Common/Message.h -Tree.o: Tree.cpp Malloc.h Tree.h avl.h ../Common/Message.h -avl.o: avl.cpp avl.h Malloc.h -Tools.o: Tools.cpp Tools.h List.h Tree.h avl.h diff --git a/Fltk/Makefile b/Fltk/Makefile index 00d4ee078c..e1cbfdc81a 100644 --- a/Fltk/Makefile +++ b/Fltk/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.21 2001-07-30 15:39:59 geuzaine Exp $ +# $Id: Makefile,v 1.22 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libFltk.a" # @@ -63,69 +63,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -Main.o: Main.cpp ../Plugin/PluginManager.h ../Common/Gmsh.h \ - ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \ - ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \ - ../Common/GmshUI.h ../Common/GmshVersion.h ../Geo/Geo.h \ - ../Geo/Verif.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 ../Common/Const.h \ - ../Common/ColorTable.h ../Common/Context.h ../Common/Options.h \ - ../Parser/Parser.h ../Common/Static.h GUI.h Opengl_Window.h \ - Colorbar_Window.h ../Parser/OpenFile.h ../Common/GetOptions.h -Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \ - ../Common/Options.h GUI.h Opengl_Window.h Colorbar_Window.h \ - ../Common/ColorTable.h -GUI.o: GUI.cpp ../Plugin/PluginManager.h ../Plugin/Plugin.h \ - ../Common/Options.h ../Common/Message.h ../Common/Gmsh.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \ - ../Geo/Geo.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 ../Common/ColorTable.h GUI.h \ - Opengl_Window.h Colorbar_Window.h Callbacks.h ../Common/Bitmaps.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 \ - ../Geo/Verif.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 ../Common/Const.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 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 \ - ../Common/Context.h ../Common/Const.h ../Geo/Geo.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 ../Common/ColorTable.h GUI.h Opengl_Window.h \ - Colorbar_Window.h ../Graphics/gl2ps.h -Opengl_Window.o: Opengl_Window.cpp ../Common/Gmsh.h \ - ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \ - ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \ - ../Common/GmshUI.h ../Common/Context.h ../Common/Const.h ../Geo/Geo.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 ../Common/ColorTable.h GUI.h Opengl_Window.h \ - Colorbar_Window.h -Colorbar_Window.o: Colorbar_Window.cpp ../Common/Gmsh.h \ - ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \ - ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \ - ../Common/GmshUI.h GUI.h Opengl_Window.h 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 ../Common/Context.h diff --git a/Geo/Makefile b/Geo/Makefile index 2e26b762ff..747a791d56 100644 --- a/Geo/Makefile +++ b/Geo/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.19 2001-07-30 15:40:00 geuzaine Exp $ +# $Id: Makefile,v 1.20 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libGeo.a" # @@ -57,52 +57,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -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 Geo.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h \ - ../Mesh/Interpolation.h ../Mesh/Numeric.h ../Common/Const.h \ - ../Mesh/Create.h CAD.h ../Common/Context.h -DataBase.o: DataBase.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.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h CAD.h ../Mesh/Create.h \ - Verif.h ../Common/Context.h -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 ../Common/Const.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 Geo.h CAD.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ExtrudeParams.h -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 ../Common/Const.h Geo.h CAD.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h ../Parser/Parser.h \ - ../Common/Context.h -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 \ - ../Common/Const.h Geo.h StepGeomDatabase.h DataBase.h \ - ../Common/Context.h -Verif.o: Verif.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h Geo.h CAD.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.h -Visibility.o: Visibility.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h Geo.h CAD.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h DataBase.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 Geo.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h CAD.h ../Common/Context.h \ - ../Common/Const.h diff --git a/Graphics/Makefile b/Graphics/Makefile index 18e2d81ecb..2c37dbfff1 100644 --- a/Graphics/Makefile +++ b/Graphics/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.25 2001-07-30 15:40:01 geuzaine Exp $ +# $Id: Makefile,v 1.26 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libGraphics.a" # @@ -30,7 +30,6 @@ SRC = Draw.cpp \ Geom.cpp \ Post.cpp \ PostSimplex.cpp \ - Iso.cpp \ IsoSimplex.cpp \ Entity.cpp \ Scale.cpp \ @@ -70,97 +69,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -Draw.o: Draw.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \ - ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \ - ../Geo/MinMax.h -Mesh.o: Mesh.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \ - ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h \ - ../Geo/MinMax.h gl2ps.h ../Geo/Verif.h ../Mesh/Numeric.h \ - ../Geo/Visibility.h -Geom.o: Geom.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.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 ../Mesh/STL.h gl2ps.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 \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \ - ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h gl2ps.h -PostSimplex.o: PostSimplex.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \ - ../Common/Const.h ../Common/ColorTable.h Iso.h IsoSimplex.h \ - ../Common/Context.h -Iso.o: Iso.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Mesh/Mesh.h ../Mesh/Vertex.h \ - ../Mesh/Simplex.h ../Mesh/Edge.h ../Geo/ExtrudeParams.h \ - ../Mesh/Metric.h Draw.h ../Common/Views.h ../Common/Const.h \ - ../Common/ColorTable.h ../Mesh/Numeric.h -IsoSimplex.o: IsoSimplex.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \ - ../Common/Const.h ../Common/ColorTable.h Iso.h ../Common/Context.h \ - ../Mesh/Numeric.h -Entity.o: Entity.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h ../Common/Views.h \ - ../Common/Const.h ../Common/ColorTable.h ../Common/Context.h -Scale.o: Scale.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \ - ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h \ - ../Motif/XContext.h -Axes.o: Axes.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/Const.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Draw.h \ - ../Common/Views.h ../Common/ColorTable.h ../Common/Context.h gl2ps.h -CreateFile.o: CreateFile.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Parser/OpenFile.h \ - ../Common/Const.h Draw.h ../Common/Views.h ../Common/ColorTable.h \ - ../Common/Context.h ../Motif/Widgets.h ../Motif/XContext.h XDump.h \ - gl2ps.h gl2gif.h gl2jpeg.h gl2ppm.h gl2yuv.h -XDump.o: XDump.cpp -gl2ps.o: gl2ps.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 gl2ps.h -gl2gif.o: gl2gif.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h gl2gif.h -gl2jpeg.o: gl2jpeg.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../jpeg/jpeglib.h ../jpeg/jconfig.h ../jpeg/jmorecfg.h \ - ../jpeg/jerror.h -gl2ppm.o: gl2ppm.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h -gl2yuv.o: gl2yuv.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h diff --git a/Makefile b/Makefile index 5343adc325..d5444ab70a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.121 2001-08-06 18:14:26 geuzaine Exp $ +# $Id: Makefile,v 1.122 2001-08-07 21:00:10 remacle Exp $ # ---------------------------------------------------------------------- # Makefile for Gmsh # ---------------------------------------------------------------------- @@ -56,7 +56,7 @@ FLTK_LIB_SOLARIS_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/sun4_5/libf Motif Fltk Plugin jpeg utils GMSH_XMOTIF_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Motif jpeg GMSH_FLTK_DIR = Adapt Common DataStr Geo Graphics Mesh Parser Fltk jpeg Plugin - GMSH_BOX_DIR = Adapt Box Common DataStr Geo Mesh Parser + GMSH_BOX_DIR = Adapt Box Common DataStr Geo Mesh Parser Plugin GMSH_BIN_DIR = bin GMSH_LIB_DIR = lib GMSH_DOC_DIR = doc @@ -70,7 +70,7 @@ FLTK_LIB_SOLARIS_SCOREC = /users/develop/develop/visual/fltk/1.0/lib/sun4_5/libf GMSH_FLTK_LIB = -L$(GMSH_LIB_DIR) -lFltk -lParser -lGraphics -lMesh -lGeo\ -lAdapt -lCommon -lDataStr -lJpeg -lPlugin GMSH_BOX_LIB = -L$(GMSH_LIB_DIR) -lBox -lParser -lMesh -lGeo\ - -lAdapt -lCommon -lDataStr + -lAdapt -lPlugin -lCommon -lDataStr GMSH_ARCHIVE = $(GMSH_ARCHIVE_DIR)/gmsh-`date "+%Y.%m.%d"` GMSH_SRCRPM = gmsh-$(GMSH_RELEASE) GMSH_SOURCES = `find . \( ! -name "*.tar*" -a ! -name "*.tgz" \ @@ -268,11 +268,11 @@ bb: tag "CC=$(CC)" \ "C_FLAGS=-O3" \ "OS_FLAGS=" \ - "VERSION_FLAGS=-D_BLACKBOX -D_NOPLUGIN" \ + "VERSION_FLAGS=-D_BLACKBOX" \ "GL_INCLUDE=" \ "GUI_INCLUDE=" \ ); done - $(CC) -o $(GMSH_BIN_DIR)/gmsh $(GMSH_BOX_LIB) -lm + $(CC) -o $(GMSH_BIN_DIR)/gmsh-bb $(GMSH_BOX_LIB) -lm bbn: tag @for i in $(GMSH_BOX_DIR) ; do (cd $$i && $(MAKE) \ diff --git a/Mesh/Makefile b/Mesh/Makefile index c617c2f48f..fbdb92141c 100644 --- a/Mesh/Makefile +++ b/Mesh/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.24 2001-07-30 15:40:01 geuzaine Exp $ +# $Id: Makefile,v 1.25 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libMesh.a" # @@ -90,212 +90,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -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 ../Common/Const.h ../Geo/Geo.h \ - Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \ - ../Common/Context.h Interpolation.h Numeric.h -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 ../Common/Const.h ../Geo/Geo.h \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \ - Create.h 2D_Mesh.h Numeric.h ../Common/Context.h -2D_SMesh.o: 2D_SMesh.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 \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 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 ../Common/Const.h ../Geo/Geo.h \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Create.h \ - Numeric.h ../Common/Context.h -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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h Numeric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.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 \ - ../Common/Const.h Mesh.h Vertex.h Simplex.h Edge.h \ - ../Geo/ExtrudeParams.h Metric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.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 Mesh.h Vertex.h Simplex.h Edge.h \ - ../Geo/ExtrudeParams.h Metric.h 2D_Mesh.h -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 \ - ../Common/Const.h Mesh.h Vertex.h Simplex.h Edge.h \ - ../Geo/ExtrudeParams.h Metric.h ../Common/Context.h Numeric.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 \ - ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Interpolation.h Mesh.h \ - 2D_Mesh.h Create.h ../Common/Context.h Numeric.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 \ - ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Interpolation.h \ - Create.h ../Common/Context.h Numeric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 3D_Mesh.h Create.h \ - Numeric.h ../Common/Context.h -3D_SMesh.o: 3D_SMesh.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 Interpolation.h Create.h -3D_BGMesh.o: 3D_BGMesh.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h Mesh.h Vertex.h 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/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 \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \ - ../Common/Context.h Create.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 \ - ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h ../Common/Context.h \ - Create.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 ../Common/Const.h ../Geo/Geo.h \ - Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \ - 3D_Mesh.h Create.h Numeric.h -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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h -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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Numeric.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 ../Common/Const.h ../Geo/Geo.h \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \ - Numeric.h ../Common/Context.h Create.h -Generator.o: Generator.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 Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \ - ../Common/Context.h ../Parser/OpenFile.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 ../Common/Const.h ../Geo/Geo.h \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \ - Create.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 ../Geo/Geo.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h 3D_Mesh.h Create.h \ - ../Geo/MinMax.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 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 \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Create.h \ - ../Geo/MinMax.h ../Geo/CAD.h ../Mesh/Mesh.h ../Common/Context.h \ - ../Common/Const.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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h SwapPatterns.h -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 ../Common/Const.h ../Geo/Geo.h \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \ - Numeric.h Interpolation.h ../Adapt/nrutil.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 ../Common/Const.h ../Geo/Geo.h \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h \ - Matrix.h Interpolation.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 Mesh.h Vertex.h Simplex.h Edge.h \ - ../Geo/ExtrudeParams.h Metric.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 \ - ../Common/Const.h ../Geo/Geo.h ../Geo/CAD.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h Mesh.h Numeric.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 ../Geo/Geo.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h Interpolation.h \ - 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 ../Common/Const.h Mesh.h Vertex.h \ - Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.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 Mesh.h Vertex.h Simplex.h Edge.h \ - ../Geo/ExtrudeParams.h Metric.h -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 Vertex.h ../Common/Context.h \ - ../Common/Const.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 Mesh.h Vertex.h Simplex.h Edge.h \ - ../Geo/ExtrudeParams.h Metric.h ../Common/Const.h -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 ../Common/Const.h ../Geo/Geo.h \ - Mesh.h Vertex.h Simplex.h Edge.h ../Geo/ExtrudeParams.h Metric.h \ - Numeric.h ../Common/Context.h diff --git a/Motif/Makefile b/Motif/Makefile index 3de4eca07f..ec51ab8bab 100644 --- a/Motif/Makefile +++ b/Motif/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.15 2001-07-30 15:40:02 geuzaine Exp $ +# $Id: Makefile,v 1.16 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libMotif.a" # @@ -71,117 +71,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -Main.o: Main.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/GmshVersion.h ../Geo/Geo.h ../Geo/Verif.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 ../Common/Const.h ../Common/ColorTable.h \ - ../Common/Context.h ../Common/Options.h ../Parser/Parser.h Widgets.h \ - Pixmaps.h XColors.h XContext.h XRessources.h CbContext.h CbGeom.h \ - Register.h Geometry.h ../Parser/OpenFile.h ../Common/GetOptions.h \ - ../Common/Static.h XStatic.h -Widgets.o: Widgets.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Common/Context.h \ - ../Common/Const.h XContext.h Info.h Widgets.h Help.h -Geometry.o: Geometry.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/Context.h ../Common/Const.h XContext.h Widgets.h -Register.o: Register.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/Context.h ../Common/Const.h XContext.h Widgets.h Register.h \ - CbOptions.h CbContext.h CbFile.h CbGeom.h CbMesh.h CbPost.h -Pixmaps.o: Pixmaps.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 Widgets.h \ - ../Common/Context.h ../Common/Const.h Pixmaps.h ../Common/Bitmaps.h \ - XColors.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 ../Geo/Geo.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 ../Common/Const.h ../Common/ColorTable.h \ - ../Common/Context.h ../Geo/MinMax.h Widgets.h XContext.h \ - ../Graphics/gl2ps.h -XColors.o: XColors.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 XContext.h -Message.o: Message.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/GmshVersion.h ../Common/Context.h ../Common/Const.h \ - Widgets.h -CbContext.o: CbContext.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \ - ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \ - ../Common/Context.h XContext.h CbContext.h CbGeom.h CbMesh.h -CbPost.o: CbPost.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \ - ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \ - ../Common/Context.h XContext.h ../Parser/OpenFile.h CbPost.h CbGeom.h \ - CbMesh.h CbColorbar.h -CbColorbar.o: CbColorbar.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h \ - ../Common/Const.h XColors.h Widgets.h Register.h ../Common/Context.h \ - XContext.h ../Common/ColorTable.h CbColorbar.h -CbGeom.o: CbGeom.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \ - ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \ - ../Common/Context.h ../Geo/Verif.h ../Parser/OpenFile.h CbGeom.h -CbMesh.o: CbMesh.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \ - ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h CbMesh.h \ - ../Common/Context.h Widgets.h -CbOptions.o: CbOptions.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Geo/Geo.h \ - ../Geo/Verif.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 ../Common/Const.h \ - ../Common/ColorTable.h Widgets.h Pixmaps.h ../Common/Context.h \ - ../Common/Options.h XContext.h Register.h ../Common/Timer.h \ - ../Geo/Visibility.h CbOptions.h CbGeom.h CbMesh.h CbPost.h -CbFile.o: CbFile.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 \ - ../Parser/OpenFile.h ../Common/Const.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 ../Common/ColorTable.h Widgets.h \ - ../Common/Context.h ../Common/Options.h ../Graphics/CreateFile.h \ - CbFile.h CbColorbar.h -CbInput.o: CbInput.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \ - ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h Widgets.h \ - ../Common/Context.h ../Common/Options.h XContext.h Register.h \ - CbContext.h CbGeom.h CbPost.h CbMesh.h -CbGeneral.o: CbGeneral.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/GmshUI.h ../Mesh/Mesh.h \ - ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Graphics/Draw.h \ - ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \ - ../Common/Context.h XContext.h Widgets.h diff --git a/Parser/Makefile b/Parser/Makefile index edf144f68e..a7298a82c9 100644 --- a/Parser/Makefile +++ b/Parser/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.24 2001-07-30 15:40:03 geuzaine Exp $ +# $Id: Makefile,v 1.25 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libParser.a" # @@ -63,28 +63,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -Gmsh.yy.o: Gmsh.yy.cpp ../Common/Gmsh.h ../Common/Message.h \ - ../DataStr/Malloc.h ../DataStr/List.h ../DataStr/Tree.h \ - ../DataStr/avl.h ../DataStr/Tools.h ../Common/Const.h ../Geo/Geo.h \ - ../Geo/CAD.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h Gmsh.tab.cpp.h -Gmsh.tab.o: Gmsh.tab.cpp ../Plugin/PluginManager.h ../Common/Gmsh.h \ - ../Common/Message.h ../DataStr/Malloc.h ../DataStr/List.h \ - ../DataStr/Tree.h ../DataStr/avl.h ../DataStr/Tools.h \ - ../Common/Const.h ../Common/Context.h ../Geo/Geo.h ../Geo/CAD.h \ - ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h ../Mesh/Edge.h \ - ../Geo/ExtrudeParams.h ../Mesh/Metric.h ../Geo/DataBase.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 ../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 \ - ../Common/Context.h Parser.h OpenFile.h ../Common/GetOptions.h \ - ../Geo/Geo.h ../Mesh/Mesh.h ../Mesh/Vertex.h ../Mesh/Simplex.h \ - ../Mesh/Edge.h ../Geo/ExtrudeParams.h ../Mesh/Metric.h \ - ../Common/Views.h ../Common/ColorTable.h ../Geo/MinMax.h \ - ../Geo/Visibility.h ../Common/GmshUI.h ../Graphics/Draw.h \ - ../Motif/Widgets.h -FunctionManager.o: FunctionManager.cpp FunctionManager.h diff --git a/Plugin/Makefile b/Plugin/Makefile index 43b1566fa6..5154754de5 100644 --- a/Plugin/Makefile +++ b/Plugin/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.11 2001-08-06 08:09:51 geuzaine Exp $ +# $Id: Makefile,v 1.12 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libAdapt.a" # @@ -53,15 +53,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -Plugin.o: Plugin.cpp Plugin.h ../Common/Options.h ../Common/Message.h \ - PluginManager.h CutPlane.h LevelsetPlugin.h CutSphere.h CutMap.h -CutPlane.o: CutPlane.cpp CutPlane.h LevelsetPlugin.h Plugin.h \ - ../Common/Options.h ../Common/Message.h ../DataStr/List.h -CutSphere.o: CutSphere.cpp CutSphere.h LevelsetPlugin.h Plugin.h \ - ../Common/Options.h ../Common/Message.h -LevelsetPlugin.o: LevelsetPlugin.cpp LevelsetPlugin.h Plugin.h \ - ../Common/Options.h ../Common/Message.h ../DataStr/List.h \ - ../Common/Views.h ../Common/Const.h ../Common/ColorTable.h \ - ../Graphics/Iso.h -CutMap.o: CutMap.cpp CutMap.h LevelsetPlugin.h Plugin.h \ - ../Common/Options.h ../Common/Message.h ../DataStr/List.h diff --git a/Plugin/Plugin.cpp b/Plugin/Plugin.cpp index 7cc36663ac..4c90490991 100644 --- a/Plugin/Plugin.cpp +++ b/Plugin/Plugin.cpp @@ -1,11 +1,14 @@ -// $Id: Plugin.cpp,v 1.19 2001-08-06 11:00:26 geuzaine Exp $ +// $Id: Plugin.cpp,v 1.20 2001-08-07 21:00:10 remacle Exp $ #ifndef _NODLL #include <dlfcn.h> #endif #include <map> + +#ifdef _FLTK #include <FL/filename.H> +#endif #include "Plugin.h" #include "PluginManager.h" @@ -116,6 +119,7 @@ void GMSH_PluginManager::RegisterDefaultPlugins(){ allPlugins.insert(std::pair<char*,GMSH_Plugin*>("Transform", GMSH_RegisterTransformPlugin())); +#ifdef _FLTK char *homeplugins = getenv ("GMSHPLUGINSHOME"); if(!homeplugins)return; int nbFiles = filename_list(homeplugins,&list); @@ -131,11 +135,12 @@ void GMSH_PluginManager::RegisterDefaultPlugins(){ } for(int i=0;i<nbFiles;i++)free(list[i]); free (list); +#endif } void GMSH_PluginManager::AddPlugin( char *dirName, char *pluginName){ -#if ( defined(WIN32) && !defined(__CYGWIN__) ) || defined(_NODLL) +#if ( defined(WIN32) && !defined(__CYGWIN__) ) || defined(_NODLL) || !defined(_FLTK) Msg(WARNING,"No dynamic plugin loading on this platform"); return; #else diff --git a/jpeg/Makefile b/jpeg/Makefile index efdfc43106..1710b9ac0a 100644 --- a/jpeg/Makefile +++ b/jpeg/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.15 2001-07-30 15:40:05 geuzaine Exp $ +# $Id: Makefile,v 1.16 2001-08-07 21:00:10 remacle Exp $ # # Makefile for "libJpeg.a" # @@ -51,43 +51,3 @@ depend: $(RM) $(RMFLAGS) Makefile.new # DO NOT DELETE THIS LINE -jcomapi.o: jcomapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jutils.o: jutils.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \ - jerror.h -jerror.o: jerror.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jversion.h jerror.h -jmemmgr.o: jmemmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h jmemsys.h -jmemnobs.o: jmemnobs.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h jmemsys.h -jcapi.o: jcapi.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \ - jerror.h -jcparam.o: jcparam.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jdatadst.o: jdatadst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jerror.h -jcmaster.o: jcmaster.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jcmarker.o: jcmarker.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jcmainct.o: jcmainct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jcprepct.o: jcprepct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jccoefct.o: jccoefct.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jccolor.o: jccolor.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jcsample.o: jcsample.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h -jchuff.o: jchuff.c jinclude.h jconfig.h jpeglib.h jmorecfg.h jpegint.h \ - jerror.h -jcdctmgr.o: jcdctmgr.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h jdct.h -jfdctfst.o: jfdctfst.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h jdct.h -jfdctflt.o: jfdctflt.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h jdct.h -jfdctint.o: jfdctint.c jinclude.h jconfig.h jpeglib.h jmorecfg.h \ - jpegint.h jerror.h jdct.h -- GitLab