X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=e1fc2839fba5876e1e6fab06e8ca2dc5e22ad453;hb=3f93b306d93117a98145292ac3fd61847226f48e;hp=c659cb280f1e3901b19e0edd730916397ce61c1b;hpb=c38c10811a065cf5b13e8807ed71864d92ca7d80;p=modules%2Fsmesh.git

diff --git a/Makefile.in b/Makefile.in
index c659cb280..e1fc2839f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,3 +1,22 @@
+#  Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
 # -* Makefile *- 
 #
 # Author : Patrick GOLDBRONN (CEA)
@@ -9,12 +28,12 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl
 
 
 @COMMENCE@
 
-SUBDIRS = idl src doc
+SUBDIRS = idl src doc adm_local
 
 RESOURCES_FILES = \
 delete.png  \
@@ -28,6 +47,7 @@ mesh_angle.png \
 mesh_area.png \
 mesh_aspect.png \
 mesh_aspect_3d.png \
+mesh_build_compound.png\
 mesh_compute.png \
 mesh_connectivity.png \
 mesh_diagonal.png \
@@ -38,6 +58,7 @@ mesh_hypo_area.png \
 mesh_hypo_length.png \
 mesh_hypo_segment.png \
 mesh_hypo_volume.png \
+mesh_hypo_edit.png \
 mesh_info.png \
 advanced_mesh_info.png \
 standard_mesh_info.png \
@@ -75,19 +96,25 @@ mesh_tree_algo.png \
 mesh_tree_algo_quad.png \
 mesh_tree_algo_regular.png \
 mesh_tree_algo_tetra.png \
+mesh_tree_algo_netgen_2d3d.png \
+mesh_tree_algo_netgen_2d.png \
 mesh_tree_hypo_area.png \
 mesh_tree_hypo_length.png \
 mesh_tree_hypo.png \
 mesh_tree_hypo_segment.png \
 mesh_tree_hypo_volume.png \
+mesh_tree_hypo_netgen.png \
+mesh_tree_hypo_netgen_2d.png \
 mesh_tree_mesh.png \
 mesh_tree_importedmesh.png \
 mesh_tree_mesh_warn.png \
+mesh_tree_mesh_partial.png \
 mesh_triangle_n.png \
 mesh_triangle.png \
 mesh_update.png \
 mesh_vertex_n.png \
 mesh_vertex.png \
+mesh_volume_3d.png \
 mesh_wireframe.png \
 mesh_points.png \
 mesh_wrap.png \
@@ -119,30 +146,61 @@ mesh_sew_conform_freeborders.png \
 mesh_sew_bordertoside.png \
 mesh_sew_sideelements.png \
 mesh_merge_nodes.png \
+mesh_merge_elements.png \
 select1.png \
 SMESH_en.xml \
 SMESH.config \
 StdMeshers.xml \
 SMESHCatalog.xml \
-flight_solid.brep \
+SalomeApp.xml \
 mesh_pattern.png \
 pattern_sample_2d.png \
 pattern_sample_3D.png \
 mesh_add.png \
-mesh_remove.png
+mesh_remove.png \
+mesh_quad_edge.png \
+mesh_quad_triangle.png \
+mesh_quad_quadrangle.png \
+mesh_quad_tetrahedron.png \
+mesh_quad_pyramid.png \
+mesh_quad_pentahedron.png \
+mesh_quad_hexahedron.png \
+mesh_conv_to_quad.png \
+mesh_tree_hypo_layers_distribution.png \
+mesh_tree_algo_radial_prism.png \
+mesh_tree_algo_projection_3d.png \
+mesh_tree_algo_projection_2d.png \
+mesh_hypo_source_edge.png \
+mesh_hypo_source_3d.png \
+mesh_hypo_layer_distribution.png \
+mesh_hypo_source_face.png \
+mesh_tree_hypo_source_face.png \
+mesh_tree_hypo_source_edge.png \
+mesh_tree_hypo_source_3d_shape.png \
+mesh_tree_hypo_projection_3d.png \
+mesh_tree_hypo_projection_2d.png \
+mesh_node_to_point.png
 
 BIN_SCRIPT= \
 VERSION
 
 # copy header files in common directory
-ifeq ($(HAVE_SSTREAM),yes)
-  include_list=include/salome/SALOMEconfig.h
-else
-  include_list=include/salome/SALOMEconfig.h include/salome/sstream
+
+include_list = include/salome/SALOMEconfig.h \
+               include/salome/SMESH_version.h
+
+ifneq ($(HAVE_SSTREAM),yes)
+	include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
 
+bin: bin/salome/VERSION
+
+bin/salome/VERSION : bin/VERSION
+	-$(RM) $@
+	$(LN_S) ../../$< $@
+
 include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
 	-$(RM) $@
 	$(LN_S) ../../$< $@
@@ -160,6 +218,10 @@ include/salome/sstream: salome_adm/unix/sstream
 	-$(RM) $@
 	$(LN_S) ../../$< $@
 
+include/salome/SMESH_version.h: SMESH_version.h
+	-$(RM) $@
+	$(LN_S) ../../$< $@
+
 depend: depend_idl
 
 depend_idl: