From be0f45394e6273c01769d2825369779322f39485 Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 25 Jan 2005 13:43:14 +0000 Subject: [PATCH] Apply patch from Paul Rascle (correction of make procedure) --- configure.in.base | 2 +- src/DriverMED/Makefile.in | 2 +- src/SMESH_I/Makefile.in | 9 +++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/configure.in.base b/configure.in.base index 38caec219..2e65ed140 100644 --- a/configure.in.base +++ b/configure.in.base @@ -351,7 +351,7 @@ do case "$local_bin" in *.in | *~) ;; ./bin/CVS | ./bin/salome) ;; - *) /usr/bin/install -C $i .; echo $local_bin ;; + *) /usr/bin/install $i .; echo $local_bin ;; esac done cd $ROOT_BUILDDIR diff --git a/src/DriverMED/Makefile.in b/src/DriverMED/Makefile.in index 19d97d9ac..47997c6d7 100644 --- a/src/DriverMED/Makefile.in +++ b/src/DriverMED/Makefile.in @@ -63,7 +63,7 @@ CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome LDFLAGS += -lMeshDriver -L${KERNEL_ROOT_DIR}/lib/salome -lMEDWrapper -LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -lMEDWrapper -lOpUtil -lSALOMELocalTrace +LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS -L${KERNEL_ROOT_DIR}/lib/salome -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.in index 5a5457f9e..700a10d33 100644 --- a/src/SMESH_I/Makefile.in +++ b/src/SMESH_I/Makefile.in @@ -92,11 +92,12 @@ LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistr -L${CASROOT}/lin/lib -lTKCDF -lTKBO -LDFLAGSFORBIN += -lSMDS -lSMESHDS -lMEDWrapper -lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \ - -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry \ - -lOpUtil -lSALOMELocalTrace -lSalomeNotification \ +LDFLAGSFORBIN += -lSMDS -lSMESHDS -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 \ + -lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \ + -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeResourcesManager \ + -lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lSalomeNotification -lCASCatch \ -lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \ - -L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls \ + -L${GEOM_ROOT_DIR}/lib/salome -lGEOMClient -lSMESHimpl -lSMESHControls -lNMTTools -lNMTDS \ -L${CASROOT}/lin/lib -lTKCDF -lTKBO @CONCLUDE@ -- 2.30.2