From f0f1c9fc7b586f82797c10a080a36f129ffcbef3 Mon Sep 17 00:00:00 2001 From: nri Date: Fri, 23 May 2003 15:17:52 +0000 Subject: [PATCH] NRI : Explode OCC_LIBS. --- src/ARCHIMEDE/Makefile.in | 2 +- src/GEOM/Makefile.in | 2 +- src/GEOMClient/Makefile.in | 2 +- src/GEOMDS/Makefile.in | 2 +- src/GEOMFiltersSelection/Makefile.in | 2 +- src/GEOMGUI/Makefile.in | 2 +- src/OBJECT/Makefile.in | 2 +- src/PARTITION/Makefile.in | 2 +- src/SKETCHER/Makefile.in | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in index d23c6791c..7bc0a6cfb 100644 --- a/src/ARCHIMEDE/Makefile.in +++ b/src/ARCHIMEDE/Makefile.in @@ -26,7 +26,7 @@ EXPORT_HEADERS = Archimede_VolumeSection.hxx # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOM/Makefile.in b/src/GEOM/Makefile.in index 1a01df836..d491ebb49 100644 --- a/src/GEOM/Makefile.in +++ b/src/GEOM/Makefile.in @@ -30,7 +30,7 @@ EXPORT_HEADERS = # 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 += $(OCC_LIBS) -lGEOMDS -lSalomeDS -lSalomeNS -lSalomeContainer -lGEOMPartition -lGEOMArchimede -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) $(OCC_DATAEXCHANGE_LIBS) -lGEOMDS -lSalomeDS -lSalomeNS -lSalomeContainer -lGEOMPartition -lGEOMArchimede -L${KERNEL_ROOT_DIR}/lib/salome # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.in index cc65ff70e..487a2543d 100644 --- a/src/GEOMClient/Makefile.in +++ b/src/GEOMClient/Makefile.in @@ -33,7 +33,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 += $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome @CONCLUDE@ diff --git a/src/GEOMDS/Makefile.in b/src/GEOMDS/Makefile.in index 30e8fdc5c..fd5cf4f24 100644 --- a/src/GEOMDS/Makefile.in +++ b/src/GEOMDS/Makefile.in @@ -43,7 +43,7 @@ EXPORT_HEADERS= GEOMDS_Application.hxx \ # 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 += $(OCC_LIBS) +LDFLAGS += $(OCC_KERNEL_LIBS) $(OCC_OCAF_LIBS) # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in index 954d25e43..36943018e 100644 --- a/src/GEOMFiltersSelection/Makefile.in +++ b/src/GEOMFiltersSelection/Makefile.in @@ -34,7 +34,7 @@ EXPORT_HEADERS= GEOM_ShapeTypeFilter.hxx \ # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in index dbbef4314..6e1a48bc4 100644 --- a/src/GEOMGUI/Makefile.in +++ b/src/GEOMGUI/Makefile.in @@ -149,6 +149,6 @@ LIB_SERVER_IDL = CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -lGEOMFiltersSelection -lGEOMSketcher $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome @CONCLUDE@ diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index 2b6f422eb..8e93d0916 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -32,7 +32,7 @@ BIN_SRC = CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+=$(QT_MT_LIBS) $(OCC_LIBS) $(VTK_LIBS) $(OGL_LIBS) $(PYTHON_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+=$(QT_MT_LIBS) $(OCC_KERNEL_LIBS) $(OCC_VIEWER_LIBS) $(VTK_LIBS) $(OGL_LIBS) $(PYTHON_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/PARTITION/Makefile.in b/src/PARTITION/Makefile.in index c5038bf8b..a112237a0 100644 --- a/src/PARTITION/Makefile.in +++ b/src/PARTITION/Makefile.in @@ -35,7 +35,7 @@ EXPORT_IDLS= CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.in index 1c5d1225e..ece7d52d9 100644 --- a/src/SKETCHER/Makefile.in +++ b/src/SKETCHER/Makefile.in @@ -26,7 +26,7 @@ EXPORT_HEADERS= GEOM_Sketcher.h \ # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome # additional file to be cleaned MOSTLYCLEAN = -- 2.39.2