From 903b9611003c7ca6f11873de1927b1d13149438f Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Thu, 9 Aug 2012 10:34:41 +0000
Subject: [PATCH] Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3

---
 src/INTERP_KERNELTest/Makefile.am | 2 --
 src/MEDWrapper/CMakeLists.txt     | 1 -
 src/RENUMBER/Makefile.am          | 9 ++++-----
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am
index 93dc410d7..547bcfa35 100644
--- 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 c07bedcc6..70f6ca703 100644
--- 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 021ba4b9b..f21d03178 100644
--- 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
-- 
2.39.2