Preparation of 3.1.0a2: version ID. compilation with new KERNEL

diff --git a/bin/VERSION b/bin/VERSION
index e2d40d0e3775c9073ff61798a654ea91843c7e85..889765dbd1708303bd54e41e127d814a800760c5 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - VISU VERSION: 3.1.0a
+THIS IS SALOME - VISU VERSION: 3.1.0a2

diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in
index 3b9480e963abb587f6b38499715ee868ad960209..8805f3d64c07f82f0c55f3fc39dc476faf8a433a 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 -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
 LDFLAGS+= $(VTK_LIBS) $(QT_LIBS) -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper
-LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
+LDFLAGSFORBIN=$(LDFLAGS) $(HDF5_LIBS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
 @CONCLUDE@

diff --git a/src/PIPELINE/Makefile.in b/src/PIPELINE/Makefile.in
index ca47dfad7381029756e253f4ef7f58c668752df5..5b46996d82a616cc018f8ef6eafcfb2703133c70 100644 (file)
--- a/src/PIPELINE/Makefile.in
+++ b/src/PIPELINE/Makefile.in
@@ -70,6 +70,6 @@ LDFLAGS+= $(VTK_LIBS) -lVTKViewer -lVisuConvertor \
        -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 -lsuit -lqtx -lSALOMEBasics
 
 @CONCLUDE@