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 336eddf011d101edbce33024f8312f3ef35e9cf0..8054ab99bb95b07c22286c53949b4826612fd574 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -106,7 +106,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/GEOM/Makefile.in b/src/GEOM/Makefile.in
index ab77d8d570da218ef996287edbd67bf758586ec2..ca263cd9777de1c2d863876d665f8388ed12b405 100644 (file)
--- a/src/GEOM/Makefile.in
+++ b/src/GEOM/Makefile.in
@@ -47,7 +47,7 @@ EXPORT_HEADERS= GEOM_Application.hxx \
 # additionnal information to compil and link file
 CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) 
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS  += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_LDPATH) $(CAS_OCAF)
+LDFLAGS  += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_OCAF) $(CAS_OCAFVIS)
 
 
 # additional file to be cleaned

diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in
index c80cb2cee047751136b7e25530409e237f41a061..260845ed6a1514ee1c5066461d86a57763dd7ed8 100644 (file)
--- a/src/GEOMBase/Makefile.in
+++ b/src/GEOMBase/Makefile.in
@@ -66,6 +66,6 @@ LIB_SERVER_IDL =
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
 CXXFLAGS += $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
 
-LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome $(CAS_LDPATH) -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer -lTKPrim
+LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim
 
 @CONCLUDE@

diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.in
index 19a40263942853523acbf4427311a1a90f41b33e..eb7281a67653a9c3ac3c965b047c046b00a3ed7a 100644 (file)
--- a/src/GEOMClient/Makefile.in
+++ b/src/GEOMClient/Makefile.in
@@ -55,7 +55,7 @@ BIN_SERVER_IDL =
 # additionnal information to compil and link file
 CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS  += $(CAS_LDPATH) -lTKTopAlgo -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS  += $(CAS_TKTopAlgo) -L${KERNEL_ROOT_DIR}/lib/salome
 
 
 @CONCLUDE@

diff --git a/src/GEOM_I/Makefile.in b/src/GEOM_I/Makefile.in
index 0a017bfc279cd748e0fef0ff57e8a0850c957bad..6cf1d5df11e2c2fab26f47424cfa41df38c54f96 100644 (file)
--- a/src/GEOM_I/Makefile.in
+++ b/src/GEOM_I/Makefile.in
@@ -87,7 +87,7 @@ EXPORT_HEADERS = GEOM_Object_i.hh \
 CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 LDFLAGS  += -lGEOMArchimede -lGEOMbasic -lGEOMimpl -lGEOMSketcher \
-            $(CAS_LDPATH) -lTKIGES -lTKSTEP -lTKFillet -lTKOffset \
+            $(CAS_DATAEXCHANGE) $(CAS_LDPATH) -lTKFillet -lTKOffset \
             -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS
 
 # additional file to be cleaned

diff --git a/src/NMTAlgo/Makefile.in b/src/NMTAlgo/Makefile.in
index 1dac5fc5fc77dec9d4c394e7ec698f3d8087894c..a79769aacdc27f2fc812e2e8873aaa3c524dcc4c 100644 (file)
--- a/src/NMTAlgo/Makefile.in
+++ b/src/NMTAlgo/Makefile.in
@@ -62,7 +62,7 @@ EXPORT_IDLS=
 
 CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS += $(CAS_LDPATH) -lNMTTools -lTKBool -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools -L${KERNEL_ROOT_DIR}/lib/salome
 
 %_moc.cxx: %.h
        $(MOC) $< -o $@

diff --git a/src/NMTTools/Makefile.in b/src/NMTTools/Makefile.in
index 9d5cbe8c2d6d20ca30cc70c8f72439d05b4230f9..77cdada9e1f8307f811461dc8e1d9d63b69279f5 100644 (file)
--- a/src/NMTTools/Makefile.in
+++ b/src/NMTTools/Makefile.in
@@ -95,7 +95,7 @@ EXPORT_IDLS=
 
 CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS += $(CAS_LDPATH) -lNMTDS -lTKBool -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS -L${KERNEL_ROOT_DIR}/lib/salome
 
 %_moc.cxx: %.h
        $(MOC) $< -o $@

diff --git a/src/ShHealOper/Makefile.in b/src/ShHealOper/Makefile.in
index efaf07c3c2e30b3b84031fcd727fc02b736d179e..82f11b3a436df7990fdd8b4778b2296d64df5578 100644 (file)
--- a/src/ShHealOper/Makefile.in
+++ b/src/ShHealOper/Makefile.in
@@ -72,7 +72,7 @@ EXPORT_IDLS=
 CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS += $(CAS_LDPATH) -lTKernel -lTKGeomAlgo -lTKG3d -lTKG2d -lTKGeomBase -lTKShHealing -lTKMath -lTKBRep -lTKTopAlgo -lTKBool 
+LDFLAGS += $(CAS_KERNEL) $(CAS_MATH) $(CAS_TKTopAlgo) $(CAS_LDPATH) -lTKBool -lTKShHealing
 
 %_moc.cxx: %.h
        $(MOC) $< -o $@