Remove dependency on MED module

diff --git a/Makefile.am b/Makefile.am
index 8208a203433ca7db6d3171ba92e767c205e4569c..974d38b25b672e55d489187d1b94428e2609efa6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
                   -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
                   -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-                 -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
                  -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files
                                
 SUBDIRS = idl adm_local resources src bin doc tests

diff --git a/build_configure b/build_configure
index b6a271bc9fa6ec40a5fa73746144d23ff88d0f17..a8e2f91deb4b739eeaf2c5427a1c5ad98761f388 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -45,15 +45,6 @@ if test ! -d "${GUI_ROOT_DIR}"; then
 fi
 
 
-########################################################################
-# Test if the MED_ROOT_DIR is set correctly
-
-if test ! -d "${MED_ROOT_DIR}"; then
-    echo "failed : MED_ROOT_DIR variable is not correct : $MED_ROOT_DIR"
-    exit
-fi
-
-
 ########################################################################
 # Test if the SMESH_ROOT_DIR is set correctly
 
@@ -80,7 +71,6 @@ echo "====================================================== aclocal"
 aclocal -I adm_local/unix/config_files \
         -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
         -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-        -I ${MED_ROOT_DIR}/adm_local/unix/config_files \
        -I ${SMESH_ROOT_DIR}/adm_local/unix/config_files || exit 1
 
 # ____________________________________________________________________

diff --git a/configure.ac b/configure.ac
index d13a49d85106f6a1494b65d97be9719b2779a4f1..48dd075b83172273f3728ec5f662c645a4a3299c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -309,14 +309,6 @@ echo
 CHECK_MED3
 
 
-echo
-echo ---------------------------------------------
-echo Testing Med Module
-echo ---------------------------------------------
-echo
-
-CHECK_MED
-
 echo
 echo ---------------------------------------------
 echo Testing Smesh
@@ -343,11 +335,11 @@ echo
 
 echo Configure
 if test "${HOMARD_WITH_GUI}" = "yes"; then
-variables="cc_ok fortran_ok boost_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok  hdf5_ok omniORB_ok Kernel_ok med3_ok SalomeGUI_ok Med_ok SMesh_ok  sphinx_ok"
+variables="cc_ok fortran_ok boost_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok  hdf5_ok omniORB_ok Kernel_ok med3_ok SalomeGUI_ok SMesh_ok  sphinx_ok"
 fi
 
 if test "${HOMARD_WITH_GUI}" = "no"; then
-variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok  doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok  sphinx_ok"
+variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok  doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok  sphinx_ok"
 fi
 
 for var in $variables

diff --git a/idl/Makefile.am b/idl/Makefile.am
index c4edc404c7453339de0eda99e080bd8df9f12361..85c912effa056895dff5808951911cd408586ae8 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -52,7 +52,6 @@ libSalomeIDLHOMARD_la_CPPFLAGS =              \
        $(KERNEL_CXXFLAGS)                      \
        -I$(top_builddir)/adm_local/unix        \
        -I$(top_builddir)/idl                   \
-       $(MED_CXXFLAGS)                         \
        @CORBA_CXXFLAGS@                        \
        @CORBA_INCLUDES@
 
@@ -60,8 +59,6 @@ libSalomeIDLHOMARD_la_LDFLAGS = -no-undefined -version-info=0:0:0
 libSalomeIDLHOMARD_la_LIBADD  =                        \
        $(KERNEL_LDFLAGS) -lSalomeIDLKernel     \
        @CORBA_LIBS@
-#        $(VISU_LDFLAGS) -lSalomeIDLVisu
-#        $(MED_LDFLAGS) -lSalomeIDLMed
 
 # These variables defines the building process of CORBA files
 OMNIORB_IDL         = @OMNIORB_IDL@
@@ -76,12 +73,10 @@ IDLCXXFLAGS = \
        @IDLCXXFLAGS@ \
        -I$(top_builddir)/idl/salome \
        -I$(KERNEL_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome \
        -I$(top_builddir)/adm_local/unix
 IDLPYFLAGS  = \
        @IDLPYFLAGS@ \
-       -I$(KERNEL_ROOT_DIR)/idl/salome \
-       -I$(MED_ROOT_DIR)/idl/salome
+       -I$(KERNEL_ROOT_DIR)/idl/salome 
 
 # potential problem on parallel make on the following - multiple outputs
 SUFFIXES = .idl .hh SK.cc
@@ -118,7 +113,7 @@ mostlyclean-local:
        @for dep in $^ dummy; do \
          if [ $$dep != "dummy" ]; then \
            echo Building dependencies for $$dep; \
-           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome  -I$(MED_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
+           $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \
            sed 's/\.o/\SK.cc/' >>$@; \
          fi; \
        done ;

diff --git a/src/HOMARDGUI/Makefile.am b/src/HOMARDGUI/Makefile.am
index 46dffbb7b40993fd3349e85ab291c53cf4455f88..7af8208c18fd6641158e02e64a0c99b120a299f4 100644 (file)
--- a/src/HOMARDGUI/Makefile.am
+++ b/src/HOMARDGUI/Makefile.am
@@ -123,8 +123,6 @@ libHOMARD_la_CPPFLAGS =          \
        -I$(srcdir)/../HOMARD_I  \
        -I$(top_builddir)/idl    \
        -I$(top_builddir)        \
-       -I$(VISU_ROOT_DIR)/include/salome  \
-       -I$(MED_ROOT_DIR)/include/salome   \
        -I$(top_builddir)/adm_local/unix
 
 libHOMARD_la_LDFLAGS  =                 \

diff --git a/src/HOMARD_I/Makefile.am b/src/HOMARD_I/Makefile.am
index aee3bc342a418a86085e559165bce573faff5c19..48612cd07eeb9f2be768cfdd28c4665c26b808b5 100644 (file)
--- a/src/HOMARD_I/Makefile.am
+++ b/src/HOMARD_I/Makefile.am
@@ -32,7 +32,7 @@ salomeinclude_HEADERS =         \
        HOMARD_Zone_i.hxx       \
        HOMARD_Gen_i.hxx        \
        HOMARD_Boundary_i.hxx   \
-        HomardMedCommun.h
+  HomardMedCommun.h
 
 # Libraries targets
 
@@ -45,7 +45,7 @@ dist_libHOMARDEngine_la_SOURCES = \
        HOMARD_Gen_i.cxx          \
        HOMARD_Zone_i.cxx         \
        HOMARD_Boundary_i.cxx     \
-        HomardMedCommun.cxx
+  HomardMedCommun.cxx
 
 
 
@@ -61,9 +61,8 @@ libHOMARDEngine_la_CPPFLAGS =                       \
        -I$(srcdir)/../HOMARDGUI              \
        -I$(top_builddir)                     \
        -I$(top_builddir)/idl                 \
-        -I$(GEOM_ROOT_DIR)/include/salome     \
-        -I$(SMESH_ROOT_DIR)/include/salome    \
-        -I$(MED_ROOT_DIR)/include/salome      \
+  -I$(GEOM_ROOT_DIR)/include/salome     \
+  -I$(SMESH_ROOT_DIR)/include/salome    \
        -I$(top_builddir)/adm_local/unix
 
 
@@ -79,5 +78,5 @@ libHOMARDEngine_la_LDFLAGS  =            \
        -lSalomeLifeCycleCORBA           \
        -lTOOLSDS                        \
        -lSalomeGenericObj               \
-        $(SMESH_LDFLAGS)                 \
+  $(SMESH_LDFLAGS)                 \
        -lSalomeIDLSMESH