Apply patch from Paul Rascle (correction of make procedure)

This commit is contained in:
vsr 2005-01-25 13:43:14 +00:00
parent 55a0f35a26
commit be0f45394e
3 changed files with 7 additions and 6 deletions

View File

@ -351,7 +351,7 @@ do
case "$local_bin" in case "$local_bin" in
*.in | *~) ;; *.in | *~) ;;
./bin/CVS | ./bin/salome) ;; ./bin/CVS | ./bin/salome) ;;
*) /usr/bin/install -C $i .; echo $local_bin ;; *) /usr/bin/install $i .; echo $local_bin ;;
esac esac
done done
cd $ROOT_BUILDDIR cd $ROOT_BUILDDIR

View File

@ -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 CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS += -lMeshDriver -L${KERNEL_ROOT_DIR}/lib/salome -lMEDWrapper 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@ @CONCLUDE@

View File

@ -92,11 +92,12 @@ LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistr
-L${CASROOT}/lin/lib -lTKCDF -lTKBO -L${CASROOT}/lin/lib -lTKCDF -lTKBO
LDFLAGSFORBIN += -lSMDS -lSMESHDS -lMEDWrapper -lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \ LDFLAGSFORBIN += -lSMDS -lSMESHDS -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 \
-L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry \ -lMeshDriver -lMeshDriverMED -lMeshDriverUNV -lMeshDriverDAT -lMeshDriverSTL \
-lOpUtil -lSALOMELocalTrace -lSalomeNotification \ -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lRegistry -lSalomeResourcesManager \
-lOpUtil -lSALOMELocalTrace -lSALOMETraceCollector -lSalomeNotification -lCASCatch \
-lSalomeHDFPersist -lSalomeLifeCycleCORBA -lTOOLSDS -lSalomeGenericObj \ -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 -L${CASROOT}/lin/lib -lTKCDF -lTKBO
@CONCLUDE@ @CONCLUDE@