Merge from V6_main 01/04/2013

[modules/hexablock.git] / src / HEXABLOCK / Makefile.am

diff --git a/src/HEXABLOCK/Makefile.am b/src/HEXABLOCK/Makefile.am
index 3d1c5b90d352a635a755e5993fd8d04588f2906e..c21aa898d5ef1692e67ca475f370a17186bfa1cc 100755 (executable)
--- a/src/HEXABLOCK/Makefile.am
+++ b/src/HEXABLOCK/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2012  CEA/DEN, EDF R&D
+# Copyright (C) 2009-2013  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
@@ -24,8 +24,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 # Files to be installed
 # ===============================================================
 #
-#      
-# header files  
+#
+# header files
 salomeinclude_HEADERS = \
        HexGroup.hxx \
        HexCylinder.hxx \
@@ -48,8 +48,18 @@ salomeinclude_HEADERS = \
        Hex.hxx \
        HexPipe.hxx \
        HexShape.hxx \
+       HexOldShape.hxx \
+       HexNewShape.hxx \
+       HexSubShape.hxx \
+       HexVertexShape.hxx \
+       HexEdgeShape.hxx \
+       HexFaceShape.hxx \
+       HexBiCylinderShape.hxx \
+       HexAssoEdge.hxx \
        HexXmlTree.hxx \
        HexCrossElements.hxx \
+       HexBiCylinder.hxx \
+       HexDumpStudy.hxx \
        HexAnaQuads.hxx \
        HexKasPoint.hxx \
        HexKasLine.hxx \
@@ -74,7 +84,7 @@ dist_libHEXABLOCKimpl_la_SOURCES = \
        HexQuad.cxx \
        HexHexa.cxx \
        HexVector.cxx \
-       HexElements.cxx \
+       HexElements.cxx \
        HexElements_bis.cxx \
        HexElements_ter.cxx \
        HexElements_piq.cxx \
@@ -85,13 +95,22 @@ dist_libHEXABLOCKimpl_la_SOURCES = \
        HexPipe.cxx \
        HexLaw.cxx \
        HexShape.cxx \
+       HexNewShape.cxx \
+       HexSubShape.cxx \
        HexDocument_trans.cxx \
+       HexVertexShape.cxx \
+       HexEdgeShape.cxx \
+       HexFaceShape.cxx \
+       HexBiCylinderShape.cxx \
+       HexAssoEdge.cxx \
        HexDocument_Xml.cxx \
        HexDocument.cxx \
        HexXmlTree.cxx \
        HexXmlWriter.cxx \
+       HexDumpStudy.cxx \
        HexCrossElements.cxx \
        HexCrossElements_build.cxx \
+       HexBiCylinder.cxx \
        Hex.cxx              \
        HexDocument_asso.cxx \
        HexDocument_quads.cxx \
@@ -102,7 +121,7 @@ dist_libHEXABLOCKimpl_la_SOURCES = \
 
 # libHEXABLOCKimpl_la_CPPFLAGS = \
 #      -I$(top_builddir)/salome_adm/unix
-# 
+#
 # libHEXABLOCKimpl_la_LDFLAGS = \
 #      -lOpUtil
 
@@ -120,7 +139,7 @@ libHEXABLOCKimpl_la_CPPFLAGS = \
 
 libHEXABLOCKimpl_la_LDFLAGS = \
        $(CAS_KERNEL) -lTKBRep -lTKPrim -lTKG2d -lTKG3d -lTKTopAlgo -lTKGeomBase -lTKGeomAlgo  -lTKBool -lTKBO \
-       $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace -lSALOMEBasics
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSALOMEBasics
 
 ####  libHexaBlockimpl_la_CPPFLAGS =  \
        ####  $(KERNEL_CXXFLAGS)    \