updating in the main trunk (only from NB and AG) for a pre building of

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

diff --git a/src/MED/Makefile.in b/src/MED/Makefile.in
index a50248dfe0ade2d15d6607af9755297b9d861046..5d06ea4f257eb73c7274db2357a705597b00dadd 100644 (file)
--- a/src/MED/Makefile.in
+++ b/src/MED/Makefile.in
@@ -1,23 +1,23 @@
 #  MED MED : implemetation of MED idl descriptions
 #
 #  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-# 
-#  This library is free software; you can redistribute it and/or 
-#  modify it under the terms of the GNU Lesser General Public 
-#  License as published by the Free Software Foundation; either 
-#  version 2.1 of the License. 
-# 
-#  This library is distributed in the hope that it will be useful, 
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-#  Lesser General Public License for more details. 
-# 
-#  You should have received a copy of the GNU Lesser General Public 
-#  License along with this library; if not, write to the Free Software 
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-# 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  You should have received a copy of the GNU Lesser General Public
+#  License along with this library; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
 #
 #
 #
@@ -27,37 +27,40 @@
 #  $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
 
 @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 \
-                SALOME_Exception.idl MED.idl             
+LIB_SRC = Med_Gen_i.cxx
+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 SALOME_Comm.idl SALOME_GenericObj.idl
 
 # Executables targets
-BIN = 
-BIN_SRC = 
+BIN =
+BIN_SRC =
 
-# additionnal information to compil and link file
+LDFLAGS= -L$(top_builddir)/lib/salome
+LDFLAGSFORBIN= -L$(top_builddir)/lib/salome
 
-CPPFLAGS += $(OCC_INCLUDES) $(MED2_INCLUDES)  $(HDF5_INCLUDES) 
-CXXFLAGS += $(OCC_CXXFLAGS) 
+# additionnal information to compil and link file
 
-LDFLAGS+= $(HDF5_LIBS) -lSalomeContainer -lTOOLSDS -lSalomeNS -lRegistry -lOpUtil -lmedmem -lMEDImpl -lSalomeHDFPersist
+CPPFLAGS += $(OCC_INCLUDES) $(MED2_INCLUDES)  $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
 
+LDFLAGS+=  $(OCC_LIBS) $(HDF5_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome \
+       -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -lMEDMEMImpl
 
 MED.hh MEDSK.cc: MED.idl
-       omniidl -bcxx -Wbtp $^
+       omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^
 
 @CONCLUDE@