0021481: [CEA 538] autoconf and med 3

diff --git a/doc/doxygen/medmem.dox b/doc/doxygen/medmem.dox
index ed955abaaf37adb2d4f3c04344c6fb94f9750dcf..fb02f403d5795f63c70e9e1e202c6e4d1ae3eaac 100644 (file)
--- a/doc/doxygen/medmem.dox
+++ b/doc/doxygen/medmem.dox
@@ -285,7 +285,7 @@ The following options can be useful to configure MEDMEM :
 - \a --enable-splitter=yes will trigger the compilation of the MEDSPLITTER tool,
 - \a --with-metis=${METISDIR} will specify a location for the METIS library,
 - \a --with-scotch=${SCOTCHDIR} will specify a location for the SCOTCH library,
-- \a --with-med2=${MED2DIR} specifies a location for MED-file library,
+- \a --with-med3=${MED3DIR} specifies a location for MED-file library,
 - \a --with-hdf5=${HDF5DIR} specifies a location for the HDF5 library (must be the same as that used for the MED-file library)
 - \a --with-lam=${LAMDIR} specifies an install path for a LAM MPI library,
 - \a --with-mpich=${MPICHDIR} specifies an install path for a MPICH-1 library.

diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am
index 38030550db0fc270b39054851a18b4c34f23c258..b5697acdb592e77548c2f9f288b2077b13cbb1fe 100644 (file)
--- a/src/INTERP_KERNELTest/Makefile.am
+++ b/src/INTERP_KERNELTest/Makefile.am
@@ -93,7 +93,7 @@ if !MED_ENABLE_MICROMED
 
    libInterpKernelTest_la_CPPFLAGS +=            \
        -DDISABLE_MICROMED                       \
-       $(MED2_INCLUDES) $(HDF5_INCLUDES)        \
+       $(MED3_INCLUDES) $(HDF5_INCLUDES)        \
        -I$(srcdir)/../MEDWrapper/V2_1/Core      \
        -I$(srcdir)/../MEDMEM
 
@@ -131,7 +131,7 @@ PerfTest_SOURCES =               \
        MeshTestToolkit.txx
 
 PerfTest_CPPFLAGS = $(libInterpKernelTest_la_CPPFLAGS)
-PerfTest_LDADD = $(MED2_LIBS) $(libInterpKernelTest_la_LDFLAGS) libInterpKernelTest.la
+PerfTest_LDADD = $(MED3_LIBS) $(libInterpKernelTest_la_LDFLAGS) libInterpKernelTest.la
 
 if MED_ENABLE_KERNEL
      TestINTERP_KERNEL_LDADD += -lSALOMEBasics

diff --git a/src/MEDLoader/Makefile.am b/src/MEDLoader/Makefile.am
index 99be5b856fd14c20b8522f40d530f83088da78b2..7dca7f2a152ecf91c018ccfddd395edab853b1d5 100755 (executable)
--- a/src/MEDLoader/Makefile.am
+++ b/src/MEDLoader/Makefile.am
@@ -46,11 +46,11 @@ MEDFileMesh.cxx MEDFileMeshElt.cxx MEDFileBasis.cxx       \
 MEDFileMeshLL.cxx MEDFileField.cxx MEDFileData.cxx      \
 SauvMedConvertor.cxx SauvReader.cxx SauvWriter.cxx
 
-libmedloader_la_CPPFLAGS= $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+libmedloader_la_CPPFLAGS= $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
        -I$(srcdir)/../INTERP_KERNEL \
        -I$(srcdir)/../INTERP_KERNEL/Geometric2D \
        -I$(srcdir)/../INTERP_KERNEL/Bases \
        -I$(srcdir)/../MEDCoupling
 
 libmedloader_la_LDFLAGS= ../MEDCoupling/libmedcoupling.la \
-../INTERP_KERNEL/libinterpkernel.la $(MED2_LIBS_C_ONLY) $(HDF5_LIBS)
+../INTERP_KERNEL/libinterpkernel.la $(MED3_LIBS_C_ONLY) $(HDF5_LIBS)

diff --git a/src/MEDLoader/Swig/Makefile.am b/src/MEDLoader/Swig/Makefile.am
index 1c306bd2c410d451eefa69868aec81eddba425e9..88e9b0b50a452ca5b311be582dbe6b71da56deaa 100644 (file)
--- a/src/MEDLoader/Swig/Makefile.am
+++ b/src/MEDLoader/Swig/Makefile.am
@@ -39,12 +39,12 @@ MEDLoader_wrap.cxx: $(SWIG_DEF)
        $(SWIG) $(SWIG_FLAGS) -o $@  $<
 
 _MEDLoader_la_CPPFLAGS = $(PYTHON_INCLUDES) \
-       $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+       $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
        -I$(srcdir)/../../INTERP_KERNEL \
        -I$(srcdir)/.. -I$(srcdir)/../../MEDCoupling_Swig -I$(srcdir)/../../INTERP_KERNEL/Bases \
        -I$(srcdir)/../../MEDCoupling
 
-_MEDLoader_la_LDFLAGS  = -module $(MED2_LIBS_C_ONLY) $(HDF5_LIBS) $(PYTHON_LIBS) \
+_MEDLoader_la_LDFLAGS  = -module $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) $(PYTHON_LIBS) \
        ../../MEDCoupling/libmedcoupling.la ../../INTERP_KERNEL/libinterpkernel.la \
        ../libmedloader.la
 

diff --git a/src/MEDLoader/Test/Makefile.am b/src/MEDLoader/Test/Makefile.am
index 0d008b8f593d81cb062035039e01d864ddcb4a9e..5abddaf6a5732383170152320b5cd62fac7cf391 100755 (executable)
--- a/src/MEDLoader/Test/Makefile.am
+++ b/src/MEDLoader/Test/Makefile.am
@@ -22,7 +22,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 bin_PROGRAMS= TestMEDLoader TestSauvLoader
 
 TestMEDLoader_CPPFLAGS=@CPPUNIT_INCLUDES@ @PTHREAD_CFLAGS@ -I$(srcdir)/.. -I$(srcdir)/../../INTERP_KERNEL/Bases -I$(srcdir)/../../INTERP_KERNELTest -I$(srcdir)/../../INTERP_KERNEL -I$(srcdir)/../../INTERP_KERNEL/Geometric2D -I$(srcdir)/../../MEDCoupling
-TestSauvLoader_CPPFLAGS=$(TestMEDLoader_CPPFLAGS) $(MED2_INCLUDES) $(HDF5_INCLUDES)
+TestSauvLoader_CPPFLAGS=$(TestMEDLoader_CPPFLAGS) $(MED3_INCLUDES) $(HDF5_INCLUDES)
 
 TestMEDLoader_LDFLAGS = @CPPUNIT_LIBS@ ../libmedloader.la ../../MEDCoupling/libmedcoupling.la ../../INTERP_KERNEL/libinterpkernel.la
 TestSauvLoader_LDFLAGS=$(TestMEDLoader_LDFLAGS)

diff --git a/src/ParaMEDLoader/Makefile.am b/src/ParaMEDLoader/Makefile.am
index aa3a4904668ba687b14c2ddb988f19b2aad6178c..b9b761cb3940d35a70f465960f6db67f5c5eb89f 100755 (executable)
--- a/src/ParaMEDLoader/Makefile.am
+++ b/src/ParaMEDLoader/Makefile.am
@@ -28,7 +28,7 @@ dist_libparamedloader_la_SOURCES= \
 ParaMEDLoader.cxx
 
 #libmedmem_la_LDFLAGS= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome 
-libparamedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+libparamedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
        -I$(srcdir)/../INTERP_KERNEL \
        -I$(srcdir)/../INTERP_KERNEL/Geometric2D \
        -I$(srcdir)/../INTERP_KERNEL/Bases \
@@ -39,4 +39,4 @@ libparamedloader_la_CPPFLAGS= $(MPI_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES)
 libparamedloader_la_LDFLAGS= ../ParaMEDMEM/libparamedmem.la \
        ../MEDLoader/libmedloader.la \
        ../MEDCoupling/libmedcoupling.la \
-       ../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED2_LIBS) $(HDF5_LIBS)
+       ../INTERP_KERNEL/libinterpkernel.la $(MPI_LIBS) $(MED3_LIBS) $(HDF5_LIBS)

diff --git a/src/ParaMEDMEM/README_JR b/src/ParaMEDMEM/README_JR
index 865af2b1d9b8916143ed9986bb86a646766df00e..f2073c79f0e98b93fee38b45c965b55db210056d 100644 (file)
--- a/src/ParaMEDMEM/README_JR
+++ b/src/ParaMEDMEM/README_JR
@@ -90,14 +90,14 @@ C MED_SRC/src/ParaMEDMEM/Test/Makefile.in :
   instrumentation du code
 . Prise en compte de $(MED_WITH_KERNEL) avec :
   ifeq ($(MED_WITH_KERNEL),yes)
-    LDFLAGSFORBIN += $(LDFLAGS) -lm $(MED2_LIBS) $(HDF5_LIBS) $(MPI_LIBS) \
+    LDFLAGSFORBIN += $(LDFLAGS) -lm $(MED3_LIBS) $(HDF5_LIBS) $(MPI_LIBS) \
                    -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -lmed_V2_1 -lparamed -lmedmem \
                    ${KERNEL_LDFLAGS} -lSALOMELocalTrace -lSALOMEBasics \
                    $(CPPUNIT_LIBS) \
                    -lParaMEDMEMTest 
   endif
   ifeq ($(MED_WITH_KERNEL),no)
-  LDFLAGSFORBIN += $(LDFLAGS) -lm $(MED2_LIBS) $(HDF5_LIBS) $(MPI_LIBS) \
+  LDFLAGSFORBIN += $(LDFLAGS) -lm $(MED3_LIBS) $(HDF5_LIBS) $(MPI_LIBS) \
                    -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -lmed_V2_1 -lparamed -linterpkernel -lmedmem \
                    ${KERNEL_LDFLAGS} ${FVM_LIBS} ${CPPUNIT_LIBS} -L/data/tmpawa/vb144235/bft_install/lib -lbft\
                   -lParaMEDMEMTest

diff --git a/src/ParaMEDMEMTest/Makefile.am b/src/ParaMEDMEMTest/Makefile.am
index 8e06c64550dfe7cfc55dc01676759eeb1d0f4ce7..8d60fdaa894e674819f64fcfdf59d08020c37345 100644 (file)
--- a/src/ParaMEDMEMTest/Makefile.am
+++ b/src/ParaMEDMEMTest/Makefile.am
@@ -106,7 +106,7 @@ dist_ParaMEDMEMTestMPI2_2_SOURCES = \
 
 endif
 
-LDADD = $(MED2_LIBS) $(libMEDMEMTest_la_LDFLAGS) -lm $(MPI_LIBS) \
+LDADD = $(MED3_LIBS) $(libMEDMEMTest_la_LDFLAGS) -lm $(MPI_LIBS) \
        libParaMEDMEMTest.la \
        ../INTERP_KERNEL/libinterpkernel.la $(CPPUNIT_LIBS) \
        ../ParaMEDMEM/libparamedmem.la \

diff --git a/src/ParaMEDMEM_Swig/Makefile.am b/src/ParaMEDMEM_Swig/Makefile.am
index e032967a03789d788f1b8f82eedf94e0190d033e..6856f2a6d6dd715c441a0e10b4bee1a2a90178d0 100644 (file)
--- a/src/ParaMEDMEM_Swig/Makefile.am
+++ b/src/ParaMEDMEM_Swig/Makefile.am
@@ -41,12 +41,12 @@ ParaMEDMEM_wrap.cxx: $(SWIG_DEF)
        $(SWIG) $(SWIG_FLAGS) -o $@  $<
 
 _ParaMEDMEM_la_CPPFLAGS = $(PYTHON_INCLUDES) \
-       $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+       $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
        -I$(srcdir)/../INTERP_KERNEL \
        $(MPI_INCLUDES) -I$(srcdir)/../ParaMEDMEM -I$(srcdir)/../MEDCoupling_Swig -I$(srcdir)/../INTERP_KERNEL/Bases \
        -I$(srcdir)/../MEDCoupling -I$(srcdir)/../ParaMEDLoader -I$(srcdir)/../MEDLoader -I$(srcdir)/../MEDLoader/Swig
 
-_ParaMEDMEM_la_LDFLAGS  = -module $(MED2_LIBS) $(HDF5_LIBS) $(PYTHON_LIBS) $(MPI_LIBS) \
+_ParaMEDMEM_la_LDFLAGS  = -module $(MED3_LIBS) $(HDF5_LIBS) $(PYTHON_LIBS) $(MPI_LIBS) \
        ../MEDCoupling/libmedcoupling.la ../INTERP_KERNEL/libinterpkernel.la \
        ../ParaMEDMEM/libparamedmem.la ../ParaMEDLoader/libparamedloader.la
 

diff --git a/src/RENUMBER/Makefile.am b/src/RENUMBER/Makefile.am
index 96daaa727c482153d0c5ec2fd0a4888fe99bb1fe..5b5088110c7b574b99dbb85e746f6164ec1cd4e2 100644 (file)
--- a/src/RENUMBER/Makefile.am
+++ b/src/RENUMBER/Makefile.am
@@ -51,14 +51,14 @@ if BOOST_IS_OK
     dist_librenumber_la_SOURCES+= RENUMBER_BOOSTRenumbering.cxx 
 endif
 
-librenumber_la_CPPFLAGS= $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
+librenumber_la_CPPFLAGS= $(MED3_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
        $(BOOST_CPPFLAGS) \
        -I$(srcdir)/../MEDMEM -I$(srcdir)/../MEDWrapper/V2_1/Core -I$(srcdir)/../INTERP_KERNEL/Bases \
        -I$(srcdir)/../INTERP_KERNEL/GaussPoints \
        -I$(srcdir)/../INTERP_KERNEL
 
 librenumber_la_LDFLAGS= 
-#libmedsplitter_la_LDFLAGS= $(MED2_LIBS) $(HDF5_LIBS) $(STDLIB) \
+#libmedsplitter_la_LDFLAGS= $(MED3_LIBS) $(HDF5_LIBS) $(STDLIB) \
 #      ../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la
 
 if MED_ENABLE_METIS
@@ -74,7 +74,7 @@ if MED_ENABLE_KERNEL
   librenumber_la_LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace 
 endif
 
-librenumber_la_LDFLAGS+= $(MED2_LIBS) $(HDF5_LIBS) $(STDLIB) \
+librenumber_la_LDFLAGS+= $(MED3_LIBS) $(HDF5_LIBS) $(STDLIB) \
        ../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la  ../INTERP_KERNEL/libinterpkernel.la
 
 # Executables targets