PR: merge from tag mergeto_HEAD_25Jan05

[modules/kernel.git] / salome_adm / unix / make_commence.in

diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in
index 2914ceda63c1f52fec124270a182ffcd72784921..620cfd9fffdf394f9c6c0ae1bdcf71609ab3fb71 100644 (file)
--- a/salome_adm/unix/make_commence.in
+++ b/salome_adm/unix/make_commence.in
@@ -2,7 +2,8 @@
 inc_builddir=$(top_builddir)/include/salome
 
 @SET_MAKE@
-SHELL=/bin/sh
+# Modifcation B. Secher portage sur osf
+SHELL=@SHELL@
 
 # header missing
 
@@ -10,11 +11,15 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+LIBSFORBIN=@LIBS@
+# LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
 # add libstdc++ to link c++ library with libtool !
-LDFLAGS+= -lstdc++
+LDFLAGS+= @STDLIB@
+LDFLAGSFORBIN+= @STDLIB@
 
-CP=@CP@
+#CP=@CP@
 
 # CPP
 
@@ -44,11 +49,17 @@ OPENPBS_INCLUDES = @OPENPBS_INCLUDES@
 OPENPBS_LIBDIR   = @OPENPBS_LIBDIR@
 OPENPBS_LIBS     = @OPENPBS_LIBS@
 
+# LSF
+
+LSF_INCLUDES = @LSF_INCLUDES@
+LSF_LIBDIR   = @LSF_LDFLAGS@
+LSF_LIBS     = @LSF_LIBS@
+
 # JAVA
 
-JAVA_INCLUDES = @JAVA_INCLUDES@
-JAVA_LIBS = @JAVA_LIBS@
-JAVA_LDPATH = @JAVA_LDPATH@
+#JAVA_INCLUDES = @JAVA_INCLUDES@
+#JAVA_LIBS = @JAVA_LIBS@
+#JAVA_LDPATH = @JAVA_LDPATH@
 
 # PYTHON
 
@@ -80,6 +91,7 @@ QWT_LIBS=@QWT_LIBS@
 SIP = @SIP@
 SIP_INCLUDES = @SIP_INCLUDES@
 SIP_LIBS = @SIP_LIBS@
+SIP_VERS = @SIP_VERS@
 
 # PYQT
 PYQT_SIPS = @PYQT_SIPS@
@@ -124,10 +136,11 @@ CAS_VIEWER=@CAS_VIEWER@
 CAS_MODELER=@CAS_MODELER@
 CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@
 CAS_LDPATH=@CAS_LDPATH@
-# MPICH
 
-MPICH_INCLUDES=@MPICH_INCLUDES@
-MPICH_LIBS=@MPICH_LIBS@
+# MPI
+
+MPI_INCLUDES=@MPI_INCLUDES@
+MPI_LIBS=@MPI_LIBS@
 
 # Swig C++ Python
 
@@ -183,8 +196,8 @@ LIBS+=$(CORBA_LIBS)
 DOXYGEN = @DOXYGEN@
 
 ## Shared libraries
-LT_STATIC_EXEC=@LT_STATIC_EXEC@
-DYNAMIC_DIRS=@DYNAMIC_DIRS@
+#LT_STATIC_EXEC=@LT_STATIC_EXEC@
+#DYNAMIC_DIRS=@DYNAMIC_DIRS@
 LT_LIB=libtool
 LT=$(top_builddir)/libtool
 LT_COMPILE=$(LT) --mode=compile $(CC)