Move MEDWrapper to MED module

diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in
index 48dae3909530d722b08dc8171007e41346293d0f..3b9480e963abb587f6b38499715ee868ad960209 100644 (file)
--- a/src/CONVERTOR/Makefile.in
+++ b/src/CONVERTOR/Makefile.in
@@ -45,7 +45,7 @@ BIN = VISUConvertor
 BIN_SRC = 
 
 CPPFLAGS+= -ftemplate-depth-32 $(VTK_INCLUDES) $(HDF5_INCLUDES) $(QT_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
-LDFLAGS+= $(VTK_LIBS) $(QT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -lMEDWrapper
+       -I${KERNEL_ROOT_DIR}/include/salome -I${MED_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS)
+LDFLAGS+= $(VTK_LIBS) $(QT_LIBS) -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper
 LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase
 @CONCLUDE@

diff --git a/src/PIPELINE/Makefile.in b/src/PIPELINE/Makefile.in
index 4e51c420ad19c2e92e31e2f1f0e824cf75f63411..738e255af8d9e464e9240a184ea4895d27cf2c3c 100644 (file)
--- a/src/PIPELINE/Makefile.in
+++ b/src/PIPELINE/Makefile.in
@@ -61,11 +61,13 @@ BIN_SRC     =
 CPPFLAGS+= $(VTK_INCLUDES) \
        -I${KERNEL_ROOT_DIR}/include/salome \
        -I${GUI_ROOT_DIR}/include/salome \
+       -L${MED_ROOT_DIR}/lib/salome \
        $(HDF5_INCLUDES) $(BOOST_CPPFLAGS)
 
 LDFLAGS+= $(VTK_LIBS) -lVTKViewer -lVisuConvertor \
        -L${KERNEL_ROOT_DIR}/lib/salome -lSALOMELocalTrace \
-       -L${GUI_ROOT_DIR}/lib/salome
+       -L${GUI_ROOT_DIR}/lib/salome \
+       -L${MED_ROOT_DIR}/lib/salome
 
 LDFLAGSFORBIN=$(LDFLAGS) -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lsuit -lqtx