From c743faa101dc41b9bf046a4d00450647467b256b Mon Sep 17 00:00:00 2001 From: asv Date: Fri, 3 Jun 2005 12:32:20 +0000 Subject: [PATCH] Makefile.in-s were modified, neccessary keys and libraries were added. OCC_KERNEL_LIBS -> CAS_KERNEL OCC_MODELER_LIBS -> CAS_MODELER --- src/ARCHIMEDE/Makefile.in | 2 +- src/DlgRef/Makefile.in | 2 +- src/GEOMBase/Makefile.in | 2 +- src/GEOMFiltersSelection/Makefile.in | 2 +- src/GEOMGUI/Makefile.in | 2 +- src/GEOMImpl/Makefile.in | 2 +- src/SKETCHER/Makefile.in | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in index b85b35997..a024382a5 100644 --- a/src/ARCHIMEDE/Makefile.in +++ b/src/ARCHIMEDE/Makefile.in @@ -46,7 +46,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_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/DlgRef/Makefile.in b/src/DlgRef/Makefile.in index 546df1fff..9cafbd1cd 100644 --- a/src/DlgRef/Makefile.in +++ b/src/DlgRef/Makefile.in @@ -152,6 +152,6 @@ LIB_SERVER_IDL = CPPFLAGS += $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -LDFLAGS += +LDFLAGS += $(QT_MT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lqtx @CONCLUDE@ diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in index cdec8fff2..eaffda30d 100644 --- 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$(GUI_ROOT_DIR)/lib/salome -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer +LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer -lSalomeDS @CONCLUDE@ diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in index 745ff6720..36fd76e9e 100644 --- a/src/GEOMFiltersSelection/Makefile.in +++ b/src/GEOMFiltersSelection/Makefile.in @@ -60,7 +60,7 @@ LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj # additionnal information to compil and link file CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome -LDFLAGS += -L$(GUI_ROOT_DIR)/lib/salome -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit +LDFLAGS += -L$(GUI_ROOT_DIR)/lib/salome -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit -lSalomeApp -lSalomeDS # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in index 6a3fb5ed6..eed3b42f9 100644 --- a/src/GEOMGUI/Makefile.in +++ b/src/GEOMGUI/Makefile.in @@ -73,6 +73,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 -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI +LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI -lSalomeDS @CONCLUDE@ diff --git a/src/GEOMImpl/Makefile.in b/src/GEOMImpl/Makefile.in index a8832db79..d715111aa 100644 --- a/src/GEOMImpl/Makefile.in +++ b/src/GEOMImpl/Makefile.in @@ -93,7 +93,7 @@ EXPORT_HEADERS= GEOMImpl_Gen.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) -lTKCAF -lCASCatch -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper +LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lCASCatch -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper # additional file to be cleaned diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.in index 086509549..a33057685 100644 --- a/src/SKETCHER/Makefile.in +++ b/src/SKETCHER/Makefile.in @@ -45,7 +45,7 @@ EXPORT_HEADERS= Sketcher_Profile.hxx # additionnal information to compil and link file CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(OCC_KERNEL_LIBS) $(OCC_MODELER_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome @CONCLUDE@