From: eap Date: Thu, 30 Sep 2010 09:49:06 +0000 (+0000) Subject: Preparation of MEDMEM for SALOME 6x X-Git-Tag: V1_MEDMEM_PreparedForV6 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=debcbd327e5ec8edf85d57d896896c2d8f513bd1;p=tools%2Fmedcoupling.git 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 12a36ef3e..4f9214a09 100644 --- 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 397ed5c44..b170b2dd3 100644 --- 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