Apply patch from Paul Rascle (correction of make procedure)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index bbeb59efbcbf3704f8e8b9a78fdf89a29fc71dd5..a3aad54410deedbb4f8ae77adb44b775b49cb007 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -10,12 +10,9 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LIBSFORBIN=@LIBS@
 LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
-LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
-LDFLAGSFORBIN+= -lstdc++
 
 CP=@CP@
 

diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in
index 2fcedade48031e68d8c54b8216bb5475c78b96b6..48dae3909530d722b08dc8171007e41346293d0f 100644 (file)
--- a/src/CONVERTOR/Makefile.in
+++ b/src/CONVERTOR/Makefile.in
@@ -47,5 +47,5 @@ BIN_SRC =
 CPPFLAGS+= -ftemplate-depth-32 $(VTK_INCLUDES) $(HDF5_INCLUDES) $(QT_INCLUDES) \
        -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
 LDFLAGS+= $(VTK_LIBS) $(QT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -lMEDWrapper
-
+LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
 @CONCLUDE@

diff --git a/src/PIPELINE/Makefile.in b/src/PIPELINE/Makefile.in
index 238425d96d60a0bcc7a0ff3abc51ff3b7e05b52f..c0bf576f5143f92b4516b60df1d92a0a4b111e7a 100644 (file)
--- a/src/PIPELINE/Makefile.in
+++ b/src/PIPELINE/Makefile.in
@@ -64,4 +64,5 @@ CPPFLAGS+= $(VTK_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome \
 LDFLAGS+= $(VTK_LIBS) -lSalomeVTKFilter -lVisuConvertor \
        -L${KERNEL_ROOT_DIR}/lib/salome -lSALOMELocalTrace
 
+LDFLAGSFORBIN=$(LDFLAGS) -lOpUtil -lMEDWrapper  -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
 @CONCLUDE@