Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3

diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am
index 93dc410d70650e7a890c52d98cbbcb7cb446817b..547bcfa3515d8f021e9e0337b8ec8f4c264768e1 100644 (file)
--- a/src/INTERP_KERNELTest/Makefile.am
+++ b/src/INTERP_KERNELTest/Makefile.am
@@ -94,11 +94,9 @@ if !MED_ENABLE_MICROMED
    libInterpKernelTest_la_CPPFLAGS +=            \
        -DDISABLE_MICROMED                       \
        $(MED3_INCLUDES) $(HDF5_INCLUDES)        \
-       -I$(srcdir)/../MEDWrapper/V2_1/Core      \
        -I$(srcdir)/../MEDMEM
 
    libInterpKernelTest_la_LDFLAGS +=             \
-       ../MEDWrapper/V2_1/Core/libmed_V2_1.la   \
        ../MEDMEM/libmedmem.la -lm 
 endif
 

diff --git a/src/MEDWrapper/CMakeLists.txt b/src/MEDWrapper/CMakeLists.txt
index c07bedcc6fd52cadd63eee0a25fecfb6b588d161..70f6ca7030b8da316e6ad593ad1a92436587c6dd 100644 (file)
--- a/src/MEDWrapper/CMakeLists.txt
+++ b/src/MEDWrapper/CMakeLists.txt
@@ -18,6 +18,5 @@
 #
 
 ADD_SUBDIRECTORY(Base)
-ADD_SUBDIRECTORY(V2_1)
 ADD_SUBDIRECTORY(V2_2)
 ADD_SUBDIRECTORY(Factory)

diff --git a/src/RENUMBER/Makefile.am b/src/RENUMBER/Makefile.am
index 021ba4b9bcd5562c6bd04e627b76ec8c8230e53a..f21d03178d34b35faf74604d8bfc947b674f8ea6 100644 (file)
--- a/src/RENUMBER/Makefile.am
+++ b/src/RENUMBER/Makefile.am
@@ -15,10 +15,9 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
 
 #  MED MEDMEM : MED files in memory
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # this directory must be recompiled before Test folder
@@ -54,13 +53,13 @@ endif
 
 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)/../MEDMEM -I$(srcdir)/../INTERP_KERNEL/Bases \
        -I$(srcdir)/../INTERP_KERNEL/GaussPoints \
        -I$(srcdir)/../INTERP_KERNEL
 
 librenumber_la_LDFLAGS= 
 #libmedsplitter_la_LDFLAGS= $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) $(STDLIB) \
-#      ../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la
+#      ../MEDMEM/libmedmem.la
 
 if MED_ENABLE_METIS
   librenumber_la_CPPFLAGS+= $(METIS_CPPFLAGS)
@@ -76,7 +75,7 @@ if MED_ENABLE_KERNEL
 endif
 
 librenumber_la_LDFLAGS+= $(MED3_LIBS_C_ONLY) $(HDF5_LIBS) $(STDLIB) \
-       ../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la  ../INTERP_KERNEL/libinterpkernel.la
+       ../MEDMEM/libmedmem.la ../INTERP_KERNEL/libinterpkernel.la
 
 # Executables targets
 bin_PROGRAMS= renumber