Preparation of MEDMEM for SALOME 6x

  remove linkage to MEDWrapper

diff --git a/src/INTERP_KERNELTest/Makefile.am b/src/INTERP_KERNELTest/Makefile.am
index 12a36ef3eb07eaf69b7ef2f2752c1e8697939bb1..4f9214a09599b128ed66ea9f10fbb822cd163d94 100644 (file)
--- a/src/INTERP_KERNELTest/Makefile.am
+++ b/src/INTERP_KERNELTest/Makefile.am
@@ -92,11 +92,9 @@ 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 397ed5c44f7a8e8b7f5e95014976fec31fce9474..b170b2dd356cf394064d15d820b53e87a6f6ba11 100644 (file)
--- a/src/RENUMBER/Makefile.am
+++ b/src/RENUMBER/Makefile.am
@@ -53,7 +53,7 @@ endif
 
 librenumber_la_CPPFLAGS= $(MED2_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
 
 librenumber_la_LDFLAGS= 
 #libmedsplitter_la_LDFLAGS= $(MED2_LIBS) $(HDF5_LIBS) $(STDLIB) \
@@ -73,7 +73,7 @@ if MED_ENABLE_KERNEL
 endif
 
 librenumber_la_LDFLAGS+= $(MED2_LIBS) $(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