NRI : Explode OCC_LIBS.

diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in
index 523e9ed2cdc419a5c65e8676a3fc892e2a0dfa50..b0a5ff01d05719caaaa051ab3b21d129b733b68a 100644 (file)
--- a/src/SALOMEDS/Makefile.in
+++ b/src/SALOMEDS/Makefile.in
@@ -88,7 +88,7 @@ BIN_CLIENT_IDL =
 
 CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES)
 CXXFLAGS+=$(OCC_CXXFLAGS)
-LDFLAGS+=$(OCC_LIBS) $(OGL_LIBS) $(HDF5_LIBS) -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer
+LDFLAGS+=$(OCC_KERNEL_LIBS) $(OCC_OCAF_LIBS) $(OGL_LIBS) $(HDF5_LIBS) -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSalomeLoggerServer
 # -L/opt/ccmalloc/lib -lccmalloc -ldl
 # -L/opt/efence/lib -lefence
 

diff --git a/src/SALOMEGUI/Makefile.in b/src/SALOMEGUI/Makefile.in
index 721761660263a0f97798334dacedf9163a182e9e..87325560ab2158466446740efd145f52dae5e77b 100644 (file)
--- a/src/SALOMEGUI/Makefile.in
+++ b/src/SALOMEGUI/Makefile.in
@@ -192,7 +192,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
                 SALOME_Exception.idl
 
 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(QWT_INCLUDES)
-LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeNS -lqsplitterP -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject
+LDFLAGS+=$(QT_MT_LIBS) $(OCC_KERNEL_LIBS) $(VTK_LIBS) $(QWT_LIBS) -lSalomeNS -lqsplitterP -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject
 
 LIBS+= $(PYTHON_LIBS)
 

diff --git a/src/SALOME_PY/Makefile.in b/src/SALOME_PY/Makefile.in
index 3a558d579903d8f6662905e895e164453cbb83a0..535a8cae0844e82ce9222724799720524e04d379 100644 (file)
--- a/src/SALOME_PY/Makefile.in
+++ b/src/SALOME_PY/Makefile.in
@@ -26,8 +26,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
                 SALOME_Exception.idl
 
 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) -DHAVE_CONFIG_H
-LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSALOME_Swigcmodule -lSalomeGUI -lVTKCommonPython -lVTKGraphicsPython -lVTKContribPython -lVTKImagingPython
-#LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeGUI -lVTKCommonPython -lVTKGraphicsPython -lVTKContribPython -lVTKImagingPython
+LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSALOME_Swigcmodule -lSalomeGUI -lVTKCommonPython -lVTKGraphicsPython -lVTKContribPython -lVTKImagingPython
 
 
 @CONCLUDE@

diff --git a/src/SALOME_PYQT/Makefile.in b/src/SALOME_PYQT/Makefile.in
index 3f343b5871bef9f8135585cfa3389b889a56a74d..b4170ba3d1b73204c32f37b388e87a2b31b2d131 100644 (file)
--- a/src/SALOME_PYQT/Makefile.in
+++ b/src/SALOME_PYQT/Makefile.in
@@ -50,7 +50,7 @@ EXPORT_SHAREDPYSCRIPTS = SalomePyQt.py
 LIB_CLIENT_IDL = SALOME_Exception.idl
 
 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(SIP_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES)
-LIBS+= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(OCC_LIBS) $(VTK_LIBS) $(OGL_LIBS)
+LIBS+= $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS)
 LDFLAGS+= -lSalomeGUI
 
 

diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in
index 9678025067df98cb66bbdf2e95e624c04f92676b..3edb511e4e4516883d038cda6d42df6053903dee 100644 (file)
--- a/src/SUPERVGraph/Makefile.in
+++ b/src/SUPERVGraph/Makefile.in
@@ -26,7 +26,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
 
 
 CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) 
-LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) -L$(top_builddir)/lib -lSalomeGUI
+LDFLAGS+=$(QT_MT_LIBS) -L$(top_builddir)/lib -lSalomeGUI
 
 
 @CONCLUDE@

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index 1f451a6387433f09ccc99d30c18f1b74fb890222..e7751334b8b0788161d69ce4fd0f0aebb854f9f7 100644 (file)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -37,7 +37,7 @@ BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOM
 
 CPPFLAGS+=$(QT_MT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES)
 CXXFLAGS+=$(OCC_CXXFLAGS)
-LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) -lSalomeNS -lSalomeGUI -lSalomeObject -lSalomeLifeCycleCORBA -lqsplitterP -lOpUtil -lSalomeLoggerServer -lPlot2d
+LDFLAGS+=$(QT_MT_LIBS) $(VTK_LIBS) -lSalomeNS -lSalomeGUI -lSalomeObject -lSalomeLifeCycleCORBA -lqsplitterP -lOpUtil -lSalomeLoggerServer -lPlot2d
 
 
 @CONCLUDE@

diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.in
index 3d96cb3900f9ec849115b51a09f329e2453dcae5..1ea5086741f5a7daf9f933308dec5247f5309504 100644 (file)
--- a/src/TOOLSGUI/Makefile.in
+++ b/src/TOOLSGUI/Makefile.in
@@ -38,7 +38,7 @@ LIB_CLIENT_IDL = SALOME_Exception.idl
 CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES)
 CXXFLAGS += $(OCC_CXXFLAGS)
 
-LDFLAGS += -lSalomeGUI $(OCC_LIBS)
+LDFLAGS += -lSalomeGUI
 
 
 @CONCLUDE@