To merge with HEAD version

diff --git a/src/PIPELINE/Makefile.in b/src/PIPELINE/Makefile.in
index 9515408cf083c1a7d933867481406ee43d644ac2..72311f9d15f5b029835e513fcf5cc029fb11200f 100644 (file)
--- a/src/PIPELINE/Makefile.in
+++ b/src/PIPELINE/Makefile.in
@@ -98,6 +98,6 @@ LDFLAGS+= \
        -L${GUI_ROOT_DIR}/lib/salome \
        -L${MED_ROOT_DIR}/lib/salome
 
-LDFLAGSFORBIN=$(LDFLAGS) -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lsuit -lqtx
+LDFLAGSFORBIN=$(LDFLAGS) -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lsuit -lqtx -lSALOMEBasics
 
 @CONCLUDE@

diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index e53b96cde2826b6257e462d80631253365da553c..bad03e4f3d0f1c3aafe9f984a3c4a6a72d1a25cd 100644 (file)
--- a/src/VISU_I/Makefile.in
+++ b/src/VISU_I/Makefile.in
@@ -58,7 +58,7 @@ LIB_CLIENT_IDL = \
        SALOME_Comm.idl
 
 # Executables targets
-#BIN = VISU_I
+BIN = VISU_I
 BIN_SRC =
 
 BIN_CLIENT_IDL =