From aed4b77195f3285fad0ddd37455078e4efba7b4c Mon Sep 17 00:00:00 2001 From: nri Date: Fri, 23 May 2003 15:05:28 +0000 Subject: [PATCH] NRI : Explode OCC_LIBS. --- src/SALOMEDS/Makefile.in | 2 +- src/SALOMEGUI/Makefile.in | 2 +- src/SALOME_PY/Makefile.in | 3 +-- src/SALOME_PYQT/Makefile.in | 2 +- src/SUPERVGraph/Makefile.in | 2 +- src/Session/Makefile.in | 2 +- src/TOOLSGUI/Makefile.in | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in index 523e9ed2c..b0a5ff01d 100644 --- 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 721761660..87325560a 100644 --- 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 3a558d579..535a8cae0 100644 --- 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 3f343b587..b4170ba3d 100644 --- 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 967802506..3edb511e4 100644 --- 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 1f451a638..e7751334b 100644 --- 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 3d96cb390..1ea508674 100644 --- 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@ -- 2.39.2