From b42e60fc2696b5ba4a66f295504f616ce7dec8d3 Mon Sep 17 00:00:00 2001
From: jroy <jroy>
Date: Tue, 29 Apr 2003 10:32:32 +0000
Subject: [PATCH] Version compilable de MED, avec make install qui marche, et
 avec repertoires d'install conformes aux specifs.

---
 idl/Makefile.in               | 2 +-
 src/MED/Makefile.in           | 4 ++--
 src/MEDGUI/Makefile.in        | 4 ++--
 src/MEDMEM/Makefile.in        | 2 +-
 src/MedCorba_Swig/Makefile.in | 4 ++--
 src/MedMem/Makefile.in        | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/idl/Makefile.in b/idl/Makefile.in
index 1cca49fb8..c14535033 100644
--- 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 ad8b18ca1..1c9a7fecb 100644
--- 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 21f07d70a..0057dc768 100644
--- 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 62a65865e..9e09ab0ba 100644
--- 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 8647b32d3..e4077d22d 100644
--- 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 ec39fa223..4fec01da5 100644
--- 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 ????
 
-- 
2.39.2