X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Makefile.in;h=4359b01f27fde022b469bc0d9bedd56bbdff78ce;hb=3f99226dd4cab97be81fc9f7563efe95d07ec8d3;hp=e6d9a7669ec6b88a455c6aa42110431396b8e837;hpb=d27a02e8c9d3a4456ccae0cd0cc561d69689d95c;p=modules%2Fgeom.git

diff --git a/Makefile.in b/Makefile.in
index e6d9a7669..4359b01f2 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,19 +28,24 @@
 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
+SUBDIRS = idl src doc adm_local
 
 RESOURCES_FILES = \
 GEOM_en.xml \
 GEOM_fr.xml \
+GEOM.config \
 GEOMCatalog.xml \
+SalomeApp.xml \
 GEOMDS_Resources \
+ImportExport \
+ShHealing \
 arc.png \
+arccenter.png \
 archimede.png \
 axisinertia.png \
 basicproperties.png \
@@ -40,9 +64,13 @@ chamfer.png \
 chamferall.png \
 chamferedge.png \
 chamferface.png \
+chamferedgefromface.png \
+change_orientation.png \
 check.png \
 circle.png \
 circlepointvector.png \
+circle3points.png \
+circlecenter2pnts.png \
 common.png \
 cone.png \
 conedxyz.png \
@@ -53,6 +81,7 @@ cylinderdxyz.png \
 cylinderpointvector.png \
 delete.png \
 display.png \
+displayonly.png \
 displayall.png \
 erase.png \
 eraseall.png \
@@ -68,6 +97,9 @@ line2points.png \
 lineedge.png \
 linepointvector.png \
 mindist.png \
+angle.png \
+mirrorPoint.png \
+mirrorAxe.png \
 mirrorPlane.png \
 ModuleGeom.png \
 multirotation.png \
@@ -76,21 +108,30 @@ multirotationsimple.png \
 multitranslation.png \
 multitranslationdouble.png \
 multitranslationsimple.png \
+normale.png \
+offset.png \
 orientation.png \
 partition.png \
 partitionkeep.png \
+partitionplane.png \
 pipe.png \
 plane.png \
 planeWorking.png \
 planedxyz.png \
+plane3points.png \
 planeface.png \
 planepointvector.png \
 planeworkingface.png \
+planeworkingvector.png \
+planeworkingorigin.png \
 point2.png \
 pointonedge.png \
+polyline.png \
 prism.png \
+prism2.png \
 revol.png \
 rotate.png \
+rotatepnt.png \
 scale.png \
 section.png \
 select1.png \
@@ -108,7 +149,9 @@ tolerance.png \
 torus.png \
 torusdxyz.png \
 toruspointvector.png \
-translation.png \
+translationDxyz.png \
+translationPoints.png \
+translationVector.png \
 tree_compound.png \
 tree_compsolid.png \
 tree_edge.png \
@@ -118,31 +161,92 @@ tree_shell.png \
 tree_solid.png \
 tree_vertex.png \
 tree_wire.png \
+tree_group_vertex.png \
+tree_group_edge.png \
+tree_group_face.png \
+tree_group_solid.png \
+tree_lcs.png \
 vector.png \
 vector2points.png \
 vectordxyz.png \
-whatis.png
+whatis.png \
+ellipse.png \
+ellipsepointvector.png \
+bezier.png \
+interpol.png \
+spline.png \
+closecontour.png \
+suppressintwires.png \
+marker.png \
+marker2.png \
+marker3.png \
+position.png \
+position2.png \
+free_bound.png \
+point_coord.png \
+point3.png \
+shapeprocess.png \
+block_2f.png \
+block_6f.png \
+block_face_2e.png \
+block_face_4e.png \
+block_face_4v.png \
+block_multitrsf_double.png \
+block_multitrsf_simple.png \
+tree_block.png \
+subblock.png \
+group_new.png \
+group_edit.png \
+glue.png \
+glue2.png \
+check_blocks_compound.png \
+free_faces.png \
+propagate.png \
+redo.png \
+undo.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/GEOM_version.h
+
+ifneq ($(HAVE_SSTREAM),yes)
+	include_list += include/salome/sstream
 endif
 
 inc: idl $(include_list)
 
-include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.h
+bin: bin/salome/VERSION
+
+bin/salome/VERSION : bin/VERSION
+	-$(RM) $@
+	$(LN_S) ../../$< $@
+
+include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
 	-$(RM) $@
 	$(LN_S) ../../$< $@
 
+# test if SALOMEconfig.h has changed (contents)
+salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h
+	@if ! [ -a $@ ]; then \
+	  cp -p -f $< $@;        \
+	fi;		      \
+	if ! cmp $< $@; then  \
+	  cp -p -f $< $@;        \
+	fi;		      \
+
 include/salome/sstream: salome_adm/unix/sstream
 	-$(RM) $@
 	$(LN_S) ../../$< $@
 
+include/salome/GEOM_version.h: GEOM_version.h
+	-$(RM) $@
+	$(LN_S) ../../$< $@
+
 depend: depend_idl
 
 depend_idl:
@@ -158,10 +262,10 @@ install-end:
 
 install-include: $(include_list)
 	$(INSTALL) -d  $(includedir)
-	@for f in X $(include_list); do				\
-	   if test $$f != X; then				\
-	     ($(INSTALL_DATA) $$f $(includedir)/. || exit 1);	\
-	   fi;							\
+	@for f in X $(include_list); do					\
+	   if test $$f != X; then					\
+	     ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1);	\
+	   fi;								\
 	done
 
 # install script in $(bindir) :