update after merging trhe branches CEA_V3_0_x, OCC_V3_1_0_a1_x, and the main

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

diff --git a/src/MedCorba_Swig/Makefile.in b/src/MedCorba_Swig/Makefile.in
index cc7d34f401310b741b61b75973e250631099e604..c8bb812f7e93b8ac71684c02b31b48015fdb36f7 100644 (file)
--- a/src/MedCorba_Swig/Makefile.in
+++ b/src/MedCorba_Swig/Makefile.in
@@ -28,7 +28,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome
+VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 @COMMENCE@
 
@@ -38,23 +38,42 @@ LIB = libMedCorba_Swigcmodule.la
 
 LIB_SRC = 
 
+ifeq (@SWIG_VERSION@, 1.3.21)
+SWIG_DEF = libMedCorba_Swig.i dummy.i
+
+dummy_wrap.cxx: libMedCorba_Swig_wrap.cxx
+       sed -e 's/SwigValueWrapper< vector<FAMILY \* > >/vector<FAMILY \* >/g' libMedCorba_Swig_wrap.cxx > toto
+       mv toto libMedCorba_Swig_wrap.cxx
+       sed -e 's/SwigValueWrapper< vector<SUPPORT \* > const >/vector<SUPPORT \* >/g' libMedCorba_Swig_wrap.cxx > toto
+       mv toto libMedCorba_Swig_wrap.cxx
+       touch dummy_wrap.cxx
+else
 SWIG_DEF = libMedCorba_Swig.i
+endif
+
+# libMedCorba_Swig.i depends on libMEDMEM_Swig.i:
+# %include "libMEDMEM_Swig.i"
+SWIG_DEP = libMEDMEM_Swig.i
 
 LIB_SERVER_IDL = MED.idl
 
-LIB_CLIENT_IDL= SALOME_Component.idl SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl
+LIB_CLIENT_IDL= SALOME_Component.idl SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOME_Comm.idl SALOME_GenericObj.idl
 
-EXPORT_PYSCRIPTS = libMedCorba_Swig.py medcorba_test.py batchmode_medcorba_test.py
+EXPORT_PYSCRIPTS = libMedCorba_Swig.py medcorba_test.py batchmode_medcorba_test.py batchmode_medcorba_test1.py
 
 EXPORT_HEADERS = libMedCorba_Swig.i
 
 #############################################################################
 
+LDFLAGS= -L$(top_builddir)/lib/salome 
+LDFLAGSFORBIN= -L$(top_builddir)/lib/salome
+
 CPPFLAGS+= $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
-CXXFLAGS=-g -D_DEBUG_ -D__x86__ -D__linux__
 CXXFLAGS+=-ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome
 LIBS= $(PYTHON_LIBS) 
-LDFLAGS+= -lMEDImpl -lMEDMEM_Swigcmodule -L${KERNEL_ROOT_DIR}/lib/salome
+#LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lMEDMEMImpl -lmedmem -lMEDMEM_Swigcmodule -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome
+# change motivated by the bug KERNEL4778.
+LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lMEDMEMImpl -lmedmem -lMEDMEM_Swigcmodule -L${KERNEL_ROOT_DIR}/lib/salome -lSALOMELocalTrace
 
 #############################################################################