building the version 2.0 of the module: first version, perhaps the good one :)

diff --git a/doc/MEDMEM/Makefile.in b/doc/MEDMEM/Makefile.in
index 9629ae135a53e75a2c37b6a050e7a1e09b87b90a..7595e14ffe87e507067b329ad210e9ea8656bb9a 100644 (file)
--- a/doc/MEDMEM/Makefile.in
+++ b/doc/MEDMEM/Makefile.in
@@ -15,13 +15,16 @@ doxygen=@DOXYGEN@
 # Executables targets
 BIN = MESHgeneral MESHcoordinates MESHconnectivities MESHINGexample FIELDcreate FIELDgeneral MEDMEM_InvokingDriverByAttachingItToAnObject MEDMEM_InvokingDriverFromStandardObjectMethod MEDMEM_InvokingDriverAtObjectCreationTime 
 
-# waiting the KERNEL version V2_0_0
-#CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
-CPPFLAGS+=-D_SALOME $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+
 CXXFLAGS+=-ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome
 
-LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome -lmedmem
+# change motivated by the bug KERNEL4778.
+#LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome
+LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
+
+#LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome -lmedmem
+LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -lSALOMELocalTrace -L${KERNEL_ROOT_DIR}/lib/salome -lmedmem
 
 LIBSFORBIN=
 

diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 1ec5083ce38e8636b4445cbc4a00884e6ee5ccf4..d7ec699ae6c82cc215fe9209b33d14944c1ac2f0 100755 (executable)
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - MED - v.1.3.0"
+PROJECT_NAME           = "SALOME - MED - v.1.4.0"
 PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/html/INPUT/sources/static/tree.js b/doc/html/INPUT/sources/static/tree.js
index aef377f03abe3f6fb1d221c1482a285d61a39c20..761dcbf31ede8ea262dd0becb6ab8942898bb489 100755 (executable)
--- a/doc/html/INPUT/sources/static/tree.js
+++ b/doc/html/INPUT/sources/static/tree.js
@@ -1,4 +1,4 @@
-foldersTree = gFld("<b>SALOME v.1.3.0 </b>", "", "")
+foldersTree = gFld("<b>SALOME v.1.4.0 </b>", "", "")
      insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
 
 aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))

diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 9a87b93abf7deb7f7f15005e1b55114fa5fcb84a..135b2daefec98b741783540625cf546cce5ad1b2 100644 (file)
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -32,6 +32,7 @@ distclean: clean
        rm -rf INPUT
 
 install:
+       $(INSTALL) -d $(docdir); \
        cp -rf html $(docdir)
 
 uninstall: