Remove uncessary libraries and dependences (for OCC6.0) from configuration

files and Makefiles.

diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4
index 99fd4be6b3c71621e06e4a10e11ad48e63af43a1..345b13f48104c115b6705f4b07e27428b5165d05 100644 (file)
--- a/salome_adm/unix/config_files/check_cas.m4
+++ b/salome_adm/unix/config_files/check_cas.m4
@@ -31,9 +31,12 @@ AC_LANG_CPLUSPLUS
 AC_SUBST(CAS_CPPFLAGS)
 AC_SUBST(CAS_CXXFLAGS)
 AC_SUBST(CAS_KERNEL)
+AC_SUBST(CAS_MATH)
 AC_SUBST(CAS_VIEWER)
+AC_SUBST(CAS_TKTopAlgo)
 AC_SUBST(CAS_MODELER)
 AC_SUBST(CAS_OCAF)
+AC_SUBST(CAS_OCAFVIS)
 AC_SUBST(CAS_DATAEXCHANGE)
 AC_SUBST(CAS_LDFLAGS)
 AC_SUBST(CAS_LDPATH)
@@ -211,35 +214,25 @@ if test "x$occ_ok" = xno ; then
   AC_MSG_WARN(Opencascade libraries not found)
 else
   AC_MSG_RESULT(yes)
-  CAS_KERNEL="$CAS_LDPATH -lTKernel -lTKMath"
+  CAS_KERNEL="$CAS_LDPATH -lTKernel"
+  CAS_MATH="$CAS_LDPATH -lTKMath"
 
-  # E.A. compatibility version 4 and 5.x  
-  CAS_OCAF="$CAS_LDPATH -lPTKernel -lTKPShape -lTKCDF -lTKCAF -lTKShapeSchema -lTKPCAF -lFWOSPlugin -lTKStdSchema"
-  if test $OCC_VERSION_MAJOR -lt 5 ; then
-    CAS_OCAF="$CAS_OCAF -lTKPAppStd"
-  fi
-  if test -f $CASROOT/$casdir/lib/libPAppStdPlugin.so ; then
-    # this library is absent in CASCADE 5.2.3
-    CAS_OCAF="$CAS_OCAF -lPAppStdPlugin"
-    CAS_STDPLUGIN="PAppStdPlugin"
-  fi
-  if test -f $CASROOT/$casdir/lib/libStdPlugin.so ; then
-    # this libraries are only for CASCADE 5.2.3
-    CAS_STDPLUGIN="StdPlugin"
-    CAS_OCAF="$CAS_OCAF -lStdPlugin -lStdLPlugin -lTKLCAF -lTKPLCAF -lTKStdLSchema"
-  fi
+  CAS_OCAF="$CAS_LDPATH -lTKernel -lTKCDF -lTKLCAF"
+  CAS_OCAFVIS="$CAS_LDPATH -lTKCAF -lStdPlugin"
   
-  CAS_VIEWER="$CAS_LDPATH -lTKOpenGl -lTKV3d -lTKService"
-  CAS_MODELER="$CAS_LDPATH -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep -lTKGeomAlgo -lTKTopAlgo -lTKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat"
+  CAS_TKV3d="$CAS_LDPATH -lTKV3d"
+  CAS_VIEWER="$CAS_TKV3d -lTKService"
 
-  # E.A. compatibility version 4 and 5.x  
-  CAS_DATAEXCHANGE="$CAS_LDPATH -lTKXSBase -lTKIGES -lTKSTEP -lTKShHealing"
-  if test $OCC_VERSION_MAJOR -lt 5 ; then
-    CAS_DATAEXCHANGE="$CAS_DATAEXCHANGE -lTKShHealingStd"
-  fi
+  CAS_TKBRep="$CAS_LDPATH -lTKG2d -lTKG3d -lTKGeomBase -lTKBRep"
+
+  CAS_TKTopAlgo="$CAS_TKBRep -lTKGeomAlgo -lTKTopAlgo"
+  CAS_TKPrim="$CAS_TKTopAlgo -lTKPrim"
+  
+  CAS_MODELER="$CAS_TKPrim -lTKBO -lTKBool -lTKHLR -lTKFillet -lTKOffset -lTKFeat"
 
+  CAS_DATAEXCHANGE="$CAS_LDPATH -lTKIGES -lTKSTEP"
 
-  CAS_LDFLAGS="$CAS_KERNEL $CAS_OCAF $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE"  
+  CAS_LDFLAGS="$CAS_KERNEL $CAS_MATH $CAS_OCAF $CAS_OCAFVIS $CAS_VIEWER $CAS_MODELER $CAS_DATAEXCHANGE"  
 
 fi
 

diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in
index 8cc3f4c469c8ad7a69959355df8361e2b03cb648..acd9fc70ab770b4285b085b5276c052bb3416b36 100644 (file)
--- a/salome_adm/unix/make_commence.in
+++ b/salome_adm/unix/make_commence.in
@@ -134,7 +134,10 @@ OCC_CXXFLAGS=@CAS_CXXFLAGS@
 #OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
 #OCC_LIBS=@CAS_LDFLAGS@
 CAS_KERNEL=@CAS_KERNEL@
+CAS_MATH=@CAS_MATH@
 CAS_OCAF=@CAS_OCAF@
+CAS_OCAFVIS=@CAS_OCAFVIS@
+CAS_TKTopAlgo=@CAS_TKTopAlgo@
 CAS_VIEWER=@CAS_VIEWER@
 CAS_MODELER=@CAS_MODELER@
 CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@

diff --git a/src/CASCatch/Makefile.in b/src/CASCatch/Makefile.in
index f6e17c1e8690fc1089e78e05901b02519dbf573b..f3477a8a5777f28777512231e55a198370ce2bde 100644 (file)
--- a/src/CASCatch/Makefile.in
+++ b/src/CASCatch/Makefile.in
@@ -24,7 +24,7 @@ LIB_SRC = CASCatch_Failure.cxx \
 
 CPPFLAGS += $(OCC_INCLUDES)
 CXXFLAGS += $(OCC_CXXFLAGS)
-LDFLAGS+= $(CAS_KERNEL)
+LDFLAGS+= $(CAS_KERNEL) $(CAS_MATH)
 
 @CONCLUDE@
 

diff --git a/src/HDFPersist/Makefile.in b/src/HDFPersist/Makefile.in
index fc3b4909e525f6b496eeb14646f3353f704ec026..b3d95e0c333bb730e358f2f23dc54932f5832f0f 100644 (file)
--- a/src/HDFPersist/Makefile.in
+++ b/src/HDFPersist/Makefile.in
@@ -97,7 +97,6 @@ LIB_SRC =  \
 #BIN = test9 test8
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) -DPCLINUX
-LDFLAGS+= $(CAS_LDPATH) -lTKernel $(HDF5_LIBS)
-
+LDFLAGS+= $(CAS_KERNEL) $(HDF5_LIBS)
 
 @CONCLUDE@

diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in
index fc2714c18be82373eae32863c61bcc0b2e141474..96fb1ae2a1bae5409d50791dd31bc405f920032f 100644 (file)
--- a/src/SALOMEDS/Makefile.in
+++ b/src/SALOMEDS/Makefile.in
@@ -119,7 +119,7 @@ BIN_CLIENT_IDL =
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS)
 CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
-LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace -lSalomeDSImpl -lSalomeGenericObj $(CAS_LDPATH) -lTKernel -lTKCAF -lTKBO -lTKStdSchema -lSalomeGenericObj -lSalomeLifeCycleCORBA
+LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace -lSalomeDSImpl -lSalomeGenericObj $(CAS_KERNEL) -lSalomeGenericObj -lSalomeLifeCycleCORBA
 
 # _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC.
 # La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans).
@@ -134,7 +134,7 @@ LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOME
 #
 LDXMUFLAGS= -L/usr/X11R6/lib -lXmu
 LDFLAGS+=$(LDXMUFLAGS)
-LDFLAGSFORBIN= $(LDFLAGS) -lTKLCAF -lTKMath -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics
+LDFLAGSFORBIN= $(LDFLAGS) $(CAS_OCAF) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics
 
 @CONCLUDE@
 

diff --git a/src/SALOMEDSImpl/Makefile.in b/src/SALOMEDSImpl/Makefile.in
index de9c3e58b265ce8325d9cc4330eb96d002df006f..fa73429a9d22e1fc0a70650fc1a0ee284cdfac02 100644 (file)
--- a/src/SALOMEDSImpl/Makefile.in
+++ b/src/SALOMEDSImpl/Makefile.in
@@ -117,7 +117,7 @@ LIB_SRC =     SALOMEDSImpl_Tool.cxx \
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES)
 CXXFLAGS+=$(OCC_CXXFLAGS)
-LDFLAGS+= $(HDF5_LIBS) -lSalomeHDFPersist $(CAS_LDPATH) -lTKCAF -lTKBO -lTKLCAF -lTKMath -lTKStdSchema -lTKernel
+LDFLAGS+= $(HDF5_LIBS) -lSalomeHDFPersist $(CAS_OCAF)
 
 # _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC.
 # La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans).

diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in
index 866f491f1576a405d83ec0388d22e5b86f9d488a..1b41aefa7512b282e39a9a152c63ef19533a8228 100644 (file)
--- a/src/TOOLSDS/Makefile.in
+++ b/src/TOOLSDS/Makefile.in
@@ -29,7 +29,7 @@ BIN_CLIENT_IDL =
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) 
 CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) 
-LDFLAGS+= -lOpUtil $(CAS_LDPATH) -lTKernel
+LDFLAGS+= -lOpUtil $(CAS_KERNEL)
 
 @CONCLUDE@