From cada3782ee9b39473432fa304a1d879aa4ab436d Mon Sep 17 00:00:00 2001 From: nadir Date: Tue, 23 Mar 2004 11:43:52 +0000 Subject: [PATCH] building the version 2.0 of the module: first version, perhaps the good one :) --- doc/MEDMEM/Makefile.in | 13 ++++++++----- doc/html/INPUT/doxyfile | 2 +- doc/html/INPUT/sources/static/tree.js | 2 +- doc/html/Makefile.in | 1 + 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/doc/MEDMEM/Makefile.in b/doc/MEDMEM/Makefile.in index 9629ae135..7595e14ff 100644 --- 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 1ec5083ce..d7ec699ae 100755 --- 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 aef377f03..761dcbf31 100755 --- a/doc/html/INPUT/sources/static/tree.js +++ b/doc/html/INPUT/sources/static/tree.js @@ -1,4 +1,4 @@ -foldersTree = gFld("SALOME v.1.3.0 ", "", "") +foldersTree = gFld("SALOME v.1.4.0 ", "", "") 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 9a87b93ab..135b2daef 100644 --- 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: -- 2.39.2