From: vsr <vsr@opencascade.com>
Date: Tue, 25 Jan 2005 14:07:16 +0000 (+0000)
Subject: Apply patch from Paul Rascle (correction of make procedure)
X-Git-Tag: V2_2_0b2~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ebe8e509fa00405f881f0b971d4bfaec7fdfab81;p=modules%2Fvisu.git

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 bbeb59ef..a3aad544 100644
--- 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 2fcedade..48dae390 100644
--- 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 238425d9..c0bf576f 100644
--- 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@