merging in the main branch with the branch br_MedFileV2_2.

[modules/med.git] / src / MED / Makefile.in

diff --git a/src/MED/Makefile.in b/src/MED/Makefile.in
index a50248dfe0ade2d15d6607af9755297b9d861046..f4a111f651a7cb7b667dddcf0d65120d75587f2c 100644 (file)
--- a/src/MED/Makefile.in
+++ b/src/MED/Makefile.in
@@ -27,23 +27,23 @@
 #  $Header$
 
 top_srcdir=@top_srcdir@
-top_builddir=../../..
+top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):$(top_builddir)/share/salome/idl
+VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome
 
 @COMMENCE@
 
-EXPORT_PYSCRIPTS =  MED_test1.py MED_test2.py
+EXPORT_PYSCRIPTS =  MED_test1.py MED_test2.py Med_Gen_test.py
 
 # Libraries targets
 
-LIB = libMedEngine.la
+LIB = libMEDEngine.la
 
 LIB_SRC = Med_Gen_i.cxx 
-LIB_SERVER_IDL = Med_Gen.idl SALOME_Component.idl \
+LIB_SERVER_IDL = MED_Gen.idl SALOME_Component.idl \
                 SALOME_Exception.idl MED.idl             
 
-LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl 
+LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_ModuleCatalog.idl
 
 # Executables targets
 BIN = 
@@ -51,13 +51,13 @@ BIN_SRC =
 
 # additionnal information to compil and link file
 
-CPPFLAGS += $(OCC_INCLUDES) $(MED2_INCLUDES)  $(HDF5_INCLUDES) 
-CXXFLAGS += $(OCC_CXXFLAGS) 
+CPPFLAGS += $(OCC_INCLUDES) $(MED2_INCLUDES)  $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS+= $(HDF5_LIBS) -lSalomeContainer -lTOOLSDS -lSalomeNS -lRegistry -lOpUtil -lmedmem -lMEDImpl -lSalomeHDFPersist
+LDFLAGS+=  $(OCC_LIBS) $(HDF5_LIBS) -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -lMEDMEMImpl -L${KERNEL_ROOT_DIR}/lib/salome
 
 
 MED.hh MEDSK.cc: MED.idl
-       omniidl -bcxx -Wbtp $^
+       omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^
 
 @CONCLUDE@