Version compilable de MED, avec make install qui marche, et avec repertoires d'instal...

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 1cca49fb82a198c88732a7e5bbf73e8c0ef222be..c145350333d51a19e0233b5ca4f7c591e7c0553d 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -6,7 +6,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=..
 srcdir=@srcdir@
-VPATH=.:$(srcdir)
+VPATH=.:$(srcdir):${KERNEL_ROOT_DIR}/idl/salome
 
 @COMMENCE@
 

diff --git a/src/MED/Makefile.in b/src/MED/Makefile.in
index ad8b18ca16f0afcf152bfc7c52918b78e970d451..1c9a7fecb63741da32a66e86b8b7ad71c67aa14a 100644 (file)
--- a/src/MED/Makefile.in
+++ b/src/MED/Makefile.in
@@ -11,7 +11,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):$(top_srcdir)/idl
+VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 @COMMENCE@
 
@@ -36,7 +36,7 @@ BIN_SRC =
 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) -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -lmedmem -lMEDImpl -L${KERNEL_ROOT_DIR}/lib
+LDFLAGS+=  $(OCC_LIBS) $(HDF5_LIBS) -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -lmedmem -lMEDImpl -L${KERNEL_ROOT_DIR}/lib/salome
 
 
 MED.hh MEDSK.cc: MED.idl

diff --git a/src/MEDGUI/Makefile.in b/src/MEDGUI/Makefile.in
index 21f07d70ab6e041beec4ea7700275fd8fbb605b7..0057dc768775e2e920a670ef079261cb4b4380ec 100644 (file)
--- a/src/MEDGUI/Makefile.in
+++ b/src/MEDGUI/Makefile.in
@@ -11,7 +11,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):$(top_srcdir)/idl
+VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 
 @COMMENCE@
@@ -43,7 +43,7 @@ LIB_SERVER_IDL =
 CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
 
-LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMedEngine -lSMESHFiltersSelection -L${KERNEL_ROOT_DIR}/lib
+LDFLAGS += -lSalomeGUI -lmedmem -lMEDImpl -lMedEngine -lSMESHFiltersSelection -L${KERNEL_ROOT_DIR}/lib/salome
 
 
 MED.hh MEDSK.cc: MED.idl

diff --git a/src/MEDMEM/Makefile.in b/src/MEDMEM/Makefile.in
index 62a65865e89d44c3717edbc111a626afcf7b9218..9e09ab0ba6f3be2ad349cc6ac0202bca865e009e 100644 (file)
--- a/src/MEDMEM/Makefile.in
+++ b/src/MEDMEM/Makefile.in
@@ -77,7 +77,7 @@ TEST_PROGS = test_MEDMEM_ModulusArray test_MEDMEM_Array test_MEDMEM_SkyLineArray
 
 CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS+=-ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib
+LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lSalomeLoggerServer -L${KERNEL_ROOT_DIR}/lib/salome
 
 # build create_mesh :
 bin: create_mesh create_mesh_c2q4s2 create_mesh_c3h8q4 create_mesh_c3h8q4_wrong create_mesh_c2q4s2_wrong

diff --git a/src/MedCorba_Swig/Makefile.in b/src/MedCorba_Swig/Makefile.in
index 8647b32d3ddba1236f7f21d8b8c50f85cc0f6202..e4077d22d34aef9ce7ea753ee90f6442a6c84a74 100644 (file)
--- a/src/MedCorba_Swig/Makefile.in
+++ b/src/MedCorba_Swig/Makefile.in
@@ -8,7 +8,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:$(srcdir):$(top_srcdir)/idl
+VPATH=.:$(srcdir):$(top_srcdir)/idl:$(top_builddir)/idl
 
 @COMMENCE@
 
@@ -32,7 +32,7 @@ CPPFLAGS+= $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_
 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
+LDFLAGS+= -lMEDImpl -lMEDMEM_Swigcmodule -L${KERNEL_ROOT_DIR}/lib/salome
 
 #############################################################################
 

diff --git a/src/MedMem/Makefile.in b/src/MedMem/Makefile.in
index ec39fa223bdc4f6f4828c41a74a80161fd2ff6e9..4fec01da5d487ffdab2f535533a51c3d5f277d50 100644 (file)
--- a/src/MedMem/Makefile.in
+++ b/src/MedMem/Makefile.in
@@ -9,7 +9,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl
+VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl
 
 MACHINE=PCLINUX
 
@@ -46,7 +46,7 @@ BIN_CLIENT_IDL =
 
 CPPFLAGS+= $(MED2_INCLUDES) $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
 CXXFLAGS=-g -D_DEBUG_ -D__x86__ -D__linux__ -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS+=-lmedmem -lOpUtil -L${KERNEL_ROOT_DIR}/lib
+LDFLAGS+=-lmedmem -lOpUtil -L${KERNEL_ROOT_DIR}/lib/salome
 #LDFLAGS+=-lmedmem  -L. -lSalomeContainer -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification
 # does we put only -lSalomeContainer and compiler retrieves -lSalomeNS -lRegistry -lOpUtil ????