]> SALOME platform Git repositories - tools/medcoupling.git/commitdiff
Salome HOME
Suppression of lib split of libinterpkernel.la
authorageay <ageay>
Wed, 4 Jan 2012 15:55:34 +0000 (15:55 +0000)
committerageay <ageay>
Wed, 4 Jan 2012 15:55:34 +0000 (15:55 +0000)
src/INTERP_KERNEL/Bases/Makefile.am [deleted file]
src/INTERP_KERNEL/ExprEval/Makefile.am [deleted file]
src/INTERP_KERNEL/GaussPoints/Makefile.am [deleted file]
src/INTERP_KERNEL/Geometric2D/Makefile.am [deleted file]
src/INTERP_KERNEL/Makefile.am
src/INTERP_KERNELTest/Makefile.am

diff --git a/src/INTERP_KERNEL/Bases/Makefile.am b/src/INTERP_KERNEL/Bases/Makefile.am
deleted file mode 100755 (executable)
index 1c2071f..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D
-#
-# 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
-#
-
-#  File   : Makefile.am
-#  Author : Vincent BERGEAUD (CEA/DEN/DANS/DM2S/SFME/LGLS)
-#  Module : MED
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-noinst_LTLIBRARIES = libinterpkernelbases.la
-
-salomeinclude_HEADERS =         \
-INTERPKERNELBASESDefines.hxx    \
-InterpKernelException.hxx       \
-NormalizedUnstructuredMesh.hxx  \
-InterpKernelStlExt.hxx          \
-InterpKernelHashMap.hxx         \
-InterpKernelHashTable.hxx       \
-InterpKernelHashFun.hxx         \
-InterpKernelAutoPtr.hxx
-
-# Libraries targets
-
-dist_libinterpkernelbases_la_SOURCES = \
-InterpKernelException.cxx
diff --git a/src/INTERP_KERNEL/ExprEval/Makefile.am b/src/INTERP_KERNEL/ExprEval/Makefile.am
deleted file mode 100644 (file)
index f032090..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D
-#
-# 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
-#
-
-#  File   : Makefile.am
-#  Author : Anthony GEAY (CEA/DEN/DANS/DM2S/SFME/LGLS)
-#  Module : MED
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-noinst_LTLIBRARIES = libinterpkernelexpreval.la
-
-salomeinclude_HEADERS =                \
-INTERPKERNELEXPREVALDefines.hxx         \
-InterpKernelExprParser.hxx              \
-InterpKernelFunction.hxx                \
-InterpKernelUnit.hxx                    \
-InterpKernelValue.hxx                   \
-InterpKernelAsmX86.hxx
-
-EXTRA_DIST +=                          \
-INTERPKERNELEXPREVALDefines.hxx         \
-InterpKernelExprParser.hxx              \
-InterpKernelFunction.hxx                \
-InterpKernelUnit.hxx                    \
-InterpKernelValue.hxx
-
-dist_libinterpkernelexpreval_la_SOURCES = \
-       InterpKernelExprParser.cxx        \
-       InterpKernelFunction.cxx          \
-       InterpKernelUnit.cxx              \
-       InterpKernelValue.cxx             \
-       InterpKernelAsmX86.cxx
-
-libinterpkernelexpreval_la_CPPFLAGS=-I$(srcdir)/../Bases
-
-libinterpkernelexpreval_la_LDFLAGS=
-
-AM_CPPFLAGS += $(libinterpkernelexpreval_la_CPPFLAGS)
-
-LDADD= $(libinterpkernelexpreval_la_LDFLAGS)
diff --git a/src/INTERP_KERNEL/GaussPoints/Makefile.am b/src/INTERP_KERNEL/GaussPoints/Makefile.am
deleted file mode 100644 (file)
index 01d4a14..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D
-#
-# 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
-#
-
-#  File   : Makefile.am
-#  Author : Vincent BERGEAUD (CEA/DEN/DANS/DM2S/SFME/LGLS)
-#  Module : MED
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-noinst_LTLIBRARIES = libinterpkernelgauss.la
-
-salomeinclude_HEADERS = \
-InterpKernelGaussCoords.hxx
-
-# Libraries targets
-dist_libinterpkernelgauss_la_SOURCES = \
-InterpKernelGaussCoords.cxx
-
-libinterpkernelgauss_la_CPPFLAGS=-I$(srcdir)/../Bases -I$(srcdir)/..
-
-AM_CPPFLAGS += $(libinterpkernelgauss_la_CPPFLAGS)
\ No newline at end of file
diff --git a/src/INTERP_KERNEL/Geometric2D/Makefile.am b/src/INTERP_KERNEL/Geometric2D/Makefile.am
deleted file mode 100644 (file)
index a69a885..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 2007-2011  CEA/DEN, EDF R&D
-#
-# 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
-#
-
-#  File   : Makefile.am
-#  Author : Anthony GEAY (CEA/DEN/DANS/DM2S/SFME/LGLS)
-#  Module : MED
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-noinst_LTLIBRARIES = libInterpGeometric2DAlg.la
-
-dist_libInterpGeometric2DAlg_la_SOURCES = \
-InterpKernelGeo2DAbstractEdge.cxx         \
-InterpKernelGeo2DBounds.cxx               \
-InterpKernelGeo2DPrecision.cxx            \
-InterpKernelGeo2DComposedEdge.cxx         \
-InterpKernelGeo2DEdgeArcCircle.cxx        \
-InterpKernelGeo2DEdge.cxx                 \
-InterpKernelGeo2DEdgeInfLin.cxx           \
-InterpKernelGeo2DEdgeLin.cxx              \
-InterpKernelGeo2DElementaryEdge.cxx       \
-InterpKernelGeo2DNode.cxx                 \
-InterpKernelGeo2DQuadraticPolygon.cxx
-
-salomeinclude_HEADERS =                \
-INTERPKERNELGEOMETRIC2DDefines.hxx     \
-InterpKernelGeo2DAbstractEdge.hxx      \
-InterpKernelGeo2DBounds.hxx            \
-InterpKernelGeo2DPrecision.hxx         \
-InterpKernelGeo2DComposedEdge.hxx      \
-InterpKernelGeo2DEdgeArcCircle.hxx     \
-InterpKernelGeo2DEdge.hxx              \
-InterpKernelGeo2DEdgeInfLin.hxx        \
-InterpKernelGeo2DEdgeLin.hxx           \
-InterpKernelGeo2DElementaryEdge.hxx    \
-InterpKernelGeo2DNode.hxx              \
-InterpKernelGeo2DQuadraticPolygon.hxx  \
-InterpKernelGeo2DEdge.txx
-
-libInterpGeometric2DAlg_la_CPPFLAGS = -I$(srcdir)/../Bases
index 5366b91bcdd039cb16f5c36cc8400a91fe1ec91a..146d6d3e665b6d7bc50269fa51a30158e34fee65 100644 (file)
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-SUBDIRS = Bases Geometric2D ExprEval GaussPoints .
-
-DIST_SUBDIRS = Bases Geometric2D ExprEval GaussPoints
-
 lib_LTLIBRARIES = libinterpkernel.la
 
-
 salomeinclude_HEADERS =                \
 BBTree.txx                             \
 BoundingBox.hxx                                \
@@ -51,8 +46,8 @@ Interpolation2D.hxx                   \
 Interpolation2D.txx                    \
 Interpolation3D.hxx                    \
 Interpolation3D.txx                    \
-Interpolation2D1D.hxx           \
-Interpolation2D1D.txx           \
+Interpolation2D1D.hxx                  \
+Interpolation2D1D.txx                  \
 Interpolation3D2D.hxx                  \
 Interpolation3D2D.txx                  \
 Interpolation3DSurf.hxx                        \
@@ -93,8 +88,8 @@ MeshUtils.hxx                         \
 PointLocatorAlgos.txx                   \
 PlanarIntersector.hxx                  \
 PlanarIntersector.txx                  \
-Planar2D1DIntersectorP0P0.hxx       \
-Planar2D1DIntersectorP0P0.txx       \
+Planar2D1DIntersectorP0P0.hxx           \
+Planar2D1DIntersectorP0P0.txx           \
 PlanarIntersectorP0P0.hxx              \
 PlanarIntersectorP0P0.txx              \
 PlanarIntersectorP0P1.hxx              \
@@ -168,7 +163,35 @@ Interpolation1D.txx                        \
 Interpolation2DCurve.hxx                \
 InterpolationCurve.hxx                 \
 InterpolationCurve.txx                 \
-DirectedBoundingBox.hxx
+DirectedBoundingBox.hxx                        \
+Bases/INTERPKERNELBASESDefines.hxx      \
+Bases/InterpKernelException.hxx         \
+Bases/NormalizedUnstructuredMesh.hxx    \
+Bases/InterpKernelStlExt.hxx            \
+Bases/InterpKernelHashMap.hxx           \
+Bases/InterpKernelHashTable.hxx         \
+Bases/InterpKernelHashFun.hxx           \
+Bases/InterpKernelAutoPtr.hxx           \
+Geometric2D/INTERPKERNELGEOMETRIC2DDefines.hxx     \
+Geometric2D/InterpKernelGeo2DAbstractEdge.hxx      \
+Geometric2D/InterpKernelGeo2DBounds.hxx            \
+Geometric2D/InterpKernelGeo2DPrecision.hxx         \
+Geometric2D/InterpKernelGeo2DComposedEdge.hxx      \
+Geometric2D/InterpKernelGeo2DEdgeArcCircle.hxx     \
+Geometric2D/InterpKernelGeo2DEdge.hxx              \
+Geometric2D/InterpKernelGeo2DEdgeInfLin.hxx        \
+Geometric2D/InterpKernelGeo2DEdgeLin.hxx           \
+Geometric2D/InterpKernelGeo2DElementaryEdge.hxx    \
+Geometric2D/InterpKernelGeo2DNode.hxx              \
+Geometric2D/InterpKernelGeo2DQuadraticPolygon.hxx  \
+Geometric2D/InterpKernelGeo2DEdge.txx              \
+ExprEval/INTERPKERNELEXPREVALDefines.hxx         \
+ExprEval/InterpKernelExprParser.hxx              \
+ExprEval/InterpKernelFunction.hxx                \
+ExprEval/InterpKernelUnit.hxx                    \
+ExprEval/InterpKernelValue.hxx                   \
+ExprEval/InterpKernelAsmX86.hxx                  \
+GaussPoints/InterpKernelGaussCoords.hxx
 
 
 EXTRA_DIST +=                  \
@@ -181,7 +204,12 @@ PlanarIntersectorP1P0.hxx  \
 PlanarIntersectorP1P0.txx      \
 VolSurfFormulae.hxx             \
 VolSurfUser.hxx                 \
-VolSurfUser.txx
+VolSurfUser.txx                 \
+ExprEval/INTERPKERNELEXPREVALDefines.hxx         \
+ExprEval/InterpKernelExprParser.hxx              \
+ExprEval/InterpKernelFunction.hxx                \
+ExprEval/InterpKernelUnit.hxx                    \
+ExprEval/InterpKernelValue.hxx
 
 # Libraries targets
 
@@ -202,15 +230,26 @@ dist_libinterpkernel_la_SOURCES = \
        Interpolation3D2D.cxx \
        MeshElement.cxx \
        InterpKernelMeshQuality.cxx \
-       InterpKernelCellSimplify.cxx
-
-libinterpkernel_la_CPPFLAGS=-I$(srcdir)/Geometric2D -I$(srcdir)/Bases
-
-libinterpkernel_la_LDFLAGS=
+       InterpKernelCellSimplify.cxx \
+       Bases/InterpKernelException.cxx \
+       Geometric2D/InterpKernelGeo2DAbstractEdge.cxx         \
+       Geometric2D/InterpKernelGeo2DBounds.cxx               \
+       Geometric2D/InterpKernelGeo2DPrecision.cxx            \
+       Geometric2D/InterpKernelGeo2DComposedEdge.cxx         \
+       Geometric2D/InterpKernelGeo2DEdgeArcCircle.cxx        \
+       Geometric2D/InterpKernelGeo2DEdge.cxx                 \
+       Geometric2D/InterpKernelGeo2DEdgeInfLin.cxx           \
+       Geometric2D/InterpKernelGeo2DEdgeLin.cxx              \
+       Geometric2D/InterpKernelGeo2DElementaryEdge.cxx       \
+       Geometric2D/InterpKernelGeo2DNode.cxx                 \
+       Geometric2D/InterpKernelGeo2DQuadraticPolygon.cxx     \
+       ExprEval/InterpKernelExprParser.cxx        \
+       ExprEval/InterpKernelFunction.cxx          \
+       ExprEval/InterpKernelUnit.cxx              \
+       ExprEval/InterpKernelValue.cxx             \
+       ExprEval/InterpKernelAsmX86.cxx            \
+       GaussPoints/InterpKernelGaussCoords.cxx
 
-# the geom2D library is included in the interpkernel one
-libinterpkernel_la_LIBADD= ./Geometric2D/libInterpGeometric2DAlg.la Bases/libinterpkernelbases.la ExprEval/libinterpkernelexpreval.la \
-       GaussPoints/libinterpkernelgauss.la
+libinterpkernel_la_CPPFLAGS= -I$(srcdir)/Bases -I$(srcdir)/Geometric2D -I$(srcdir)/ExprEval -I$(srcdir)/GaussPoints
 
 AM_CPPFLAGS += $(libinterpkernel_la_CPPFLAGS)
-LDADD= $(libinterpkernel_la_LDFLAGS)
index 17b3730c19e09e024ab88f7108b4cfaadfd2ae9f..38030550db0fc270b39054851a18b4c34f23c258 100644 (file)
@@ -74,8 +74,7 @@ libInterpKernelTest_la_CPPFLAGS =                \
 
 libInterpKernelTest_la_LDFLAGS  =                \
        @CPPUNIT_LIBS@                           \
-       ../INTERP_KERNEL/libinterpkernel.la      \
-       ../INTERP_KERNEL/Geometric2D/libInterpGeometric2DAlg.la
+       ../INTERP_KERNEL/libinterpkernel.la
 
 if !MED_ENABLE_MICROMED
    libInterpKernelTest_la_SOURCES +=         \