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

files and Makefiles.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index c5cec34a511669f36ee86fb625d3ca97b99893b8..dc088d21783a7d8f2345b828805e28baa7d3641d 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -115,7 +115,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/CAF/Makefile.in b/src/CAF/Makefile.in
index b4789adf7a5d5ac11961c90328181538ba4c3a10..8aae89d85b19815186bb044604ddfd6a3677e670 100755 (executable)
--- a/src/CAF/Makefile.in
+++ b/src/CAF/Makefile.in
@@ -42,7 +42,7 @@ undo.png
 
 CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) -I${QTDIR}/src/kernel -I$(QTDIR)/mkspecs/linux-g++
 
-LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_OCAF)
+LDFLAGS+=$(QT_MT_LIBS) $(CAS_OCAF) $(CAS_OCAFVIS)
 LIBS+= -lstd -lsuit
 
 @CONCLUDE@

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index 2849d67bd21e960eb02fc11c50ea94ef6a0943b5..226711e2b314144b4872a1ffbffc4dae6b7107a7 100755 (executable)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -61,7 +61,7 @@ BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOM
 
 CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(OCC_INCLUDES)
 CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
-LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lCASCatch -lSalomeCatalog -lSalomeDS $(CAS_LDPATH) -lTKernel
+LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lCASCatch -lSalomeCatalog -lSalomeDS $(CAS_KERNEL)
 
 LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics
 

diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.in
index fa2e1ee217f5310eb20236ccf266717848d3c45a..e8e183e7f0b6b2e6d8967431f9d0dd47a339b951 100755 (executable)
--- a/src/TOOLSGUI/Makefile.in
+++ b/src/TOOLSGUI/Makefile.in
@@ -60,7 +60,7 @@ LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
 CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS += $(QT_MT_LIBS) -lsuit $(CAS_LDPATH) -lTKernel -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil
+LDFLAGS += $(QT_MT_LIBS) -lsuit $(CAS_KERNEL) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil
 
 @CONCLUDE@