From: eap <eap@opencascade.com>
Date: Fri, 15 Apr 2011 09:13:44 +0000 (+0000)
Subject: Restore support of med-2.1 in MEDWrapper
X-Git-Tag: V6_3_0a1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=50962a4269c226afe2dd33590f1c11b792a84033;p=tools%2Fmedcoupling.git

Restore support of med-2.1 in MEDWrapper
---

diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am
index fb9a3effa..61fcfca0d 100644
--- a/src/INTERP_KERNELTest/Makefile.am
+++ b/src/INTERP_KERNELTest/Makefile.am
@@ -93,9 +93,11 @@ if !MED_ENABLE_MICROMED
    libInterpKernelTest_la_CPPFLAGS +=            \
 	-DDISABLE_MICROMED                       \
 	$(MED2_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/RENUMBER/Makefile.am b/src/RENUMBER/Makefile.am
index 09a4a2ec0..62e00d762 100644
--- a/src/RENUMBER/Makefile.am
+++ b/src/RENUMBER/Makefile.am
@@ -53,13 +53,13 @@ endif
 
 librenumber_la_CPPFLAGS= $(MED2_INCLUDES) $(HDF5_INCLUDES) @CXXTMPDPTHFLAGS@ \
 	$(BOOST_CPPFLAGS) \
-	-I$(srcdir)/../MEDMEM -I$(srcdir)/../INTERP_KERNEL/Bases \
+	-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) \
-#	../MEDMEM/libmedmem.la
+#	../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la
 
 if MED_ENABLE_METIS
   librenumber_la_CPPFLAGS+= $(METIS_CPPFLAGS)
@@ -75,7 +75,7 @@ if MED_ENABLE_KERNEL
 endif
 
 librenumber_la_LDFLAGS+= $(MED2_LIBS) $(HDF5_LIBS) $(STDLIB) \
-	../MEDMEM/libmedmem.la ../INTERP_KERNEL/libinterpkernel.la
+	../MEDMEM/libmedmem.la ../MEDWrapper/V2_1/Core/libmed_V2_1.la  ../INTERP_KERNEL/libinterpkernel.la
 
 # Executables targets
 bin_PROGRAMS= renumber