X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FSMESH%2FMakefile.am;fp=src%2FSMESH%2FMakefile.am;h=3008e024fe790155b5fff9483b1339205a00a2c2;hp=2905cc92bec9cb0e5b81f7f7c78515004437671b;hb=bd4e115a78b52e3fbc016e5e30bb0e19b2a9e7d6;hpb=0635c9fc80f67d1e5dc0e94ec85f487286a92070

diff --git a/src/SMESH/Makefile.am b/src/SMESH/Makefile.am
index 2905cc92b..3008e024f 100644
--- a/src/SMESH/Makefile.am
+++ b/src/SMESH/Makefile.am
@@ -1,31 +1,28 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-#  Copyright (C) 2003-2007  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 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.
 #
-#  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
 #
-#  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
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  SMESH SMESH : implementaion of SMESH idl descriptions
 #  File   : Makefile.in
 #  Author : Paul RASCLE, EDF
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
 #  Module : SMESH
-#  $Header$
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
@@ -43,17 +40,9 @@ salomeinclude_HEADERS = \
 	SMESH_3D_Algo.hxx \
 	SMESH_Group.hxx \
 	SMESH_MeshEditor.hxx \
-	SMESH_Block.hxx \
 	SMESH_Pattern.hxx \
-	SMESH_IndexedDataMapOfShapeIndexedMapOfShape.hxx \
-	SMESH_DataMapOfElemPtrSequenceOfElemPtr.hxx \
-	SMESH_SequenceOfElemPtr.hxx \
-	SMESH_SequenceOfNode.hxx \
 	SMESH_MesherHelper.hxx \
-	SMESH_Octree.hxx \
-	SMESH_OctreeNode.hxx \
-	SMESH_Comment.hxx \
-	SMESH_ComputeError.hxx \
+	SMESH_ProxyMesh.hxx \
 	SMESH_SMESH.hxx
 
 # Libraries targets
@@ -61,6 +50,7 @@ salomeinclude_HEADERS = \
 lib_LTLIBRARIES = libSMESHimpl.la
 
 dist_libSMESHimpl_la_SOURCES = \
+	memoire.h \
 	SMESH_Gen.cxx \
 	SMESH_Mesh.cxx \
 	SMESH_subMesh.cxx \
@@ -72,12 +62,10 @@ dist_libSMESHimpl_la_SOURCES = \
 	SMESH_3D_Algo.cxx \
 	SMESH_Group.cxx \
 	SMESH_MeshEditor.cxx \
-	SMESH_Block.cxx \
 	SMESH_Pattern.cxx \
 	SMESH_HypoFilter.cxx \
-	SMESH_MesherHelper.cxx \
-	SMESH_Octree.cxx \
-	SMESH_OctreeNode.cxx
+	SMESH_ProxyMesh.cxx \
+	SMESH_MesherHelper.cxx
 
 # additionnal information to compile and link file
 libSMESHimpl_la_CPPFLAGS = \
@@ -85,6 +73,7 @@ libSMESHimpl_la_CPPFLAGS = \
 	$(CAS_CPPFLAGS) \
 	$(MED_CXXFLAGS) \
 	$(GEOM_CXX_FLAGS) \
+        $(VTK_INCLUDES) \
 	$(BOOST_CPPFLAGS) \
 	@HDF5_INCLUDES@ \
 	-I$(srcdir)/../Controls \
@@ -93,10 +82,14 @@ libSMESHimpl_la_CPPFLAGS = \
 	-I$(srcdir)/../DriverMED \
 	-I$(srcdir)/../DriverUNV \
 	-I$(srcdir)/../DriverSTL \
+	-I$(srcdir)/../DriverCGNS \
 	-I$(srcdir)/../SMDS \
 	-I$(srcdir)/../SMESHDS \
-	-I$(top_builddir)/salome_adm/unix
+	-I$(srcdir)/../SMESHUtils
 
+if WITH_CGNS
+  DriverCGNS_LIB = ../DriverCGNS/libMeshDriverCGNS.la
+endif
 
 libSMESHimpl_la_LDFLAGS = \
 	../SMESHDS/libSMESHDS.la \
@@ -105,5 +98,8 @@ libSMESHimpl_la_LDFLAGS = \
 	../DriverSTL/libMeshDriverSTL.la \
 	../DriverMED/libMeshDriverMED.la \
 	../DriverUNV/libMeshDriverUNV.la \
+	$(DriverCGNS_LIB) \
+	../SMESHUtils/libSMESHUtils.la \
+	$(BOOST_LIB_THREAD)  \
 	$(GEOM_LDFLAGS) -lNMTTools \
-	$(CAS_LDPATH) -lTKShHealing
+	$(CAS_LDPATH) -lTKShHealing -lTKPrim -lTKG2d