Porting on Mandriva 64 (to unify libdir usage)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index cab6f0e5c5db8edf52bef0c32c7a02840ff34dc4..a5162a4c3f07215f4ca54b6dac0d1032cfc1dc3d 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 
 LIBS=@LIBS@ 
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 
@@ -53,8 +53,8 @@ PYTHONHOME = @PYTHONHOME@
 PYTHON_INCLUDES = @PYTHON_INCLUDES@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_VERSION = @PYTHON_VERSION@
-PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages
-PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome
+PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages
+PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome
 # QT
 
 QT_ROOT = @QT_ROOT@
@@ -103,12 +103,6 @@ HDF5_MT_LIBS=@HDF5_MT_LIBS@
 OCC_INCLUDES=@CAS_CPPFLAGS@
 OCC_CXXFLAGS=@CAS_CXXFLAGS@
 
-#OCC_KERNEL_LIBS=@CAS_KERNEL@
-#OCC_OCAF_LIBS=@CAS_OCAF@
-#OCC_VIEWER_LIBS=@CAS_VIEWER@
-#OCC_MODELER_LIBS=@CAS_MODELER@
-#OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
-#OCC_LIBS=@CAS_LDFLAGS@
 CAS_KERNEL=@CAS_KERNEL@
 CAS_OCAF=@CAS_OCAF@
 CAS_VIEWER=@CAS_VIEWER@
@@ -197,16 +191,30 @@ INSTALL_DATA=@INSTALL_DATA@
 # create a symbolic link (or a copie ?)
 LN_S=@LN_S@
 
+KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@
+KERNEL_SITE_DIR=@KERNEL_SITE_DIR@
+
+KERNEL_LDFLAGS=@KERNEL_LDFLAGS@
+KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
+
+GUI_ROOT_DIR=@GUI_ROOT_DIR@
+GUI_LDFLAGS=@GUI_LDFLAGS@
+GUI_CXXFLAGS=@GUI_CXXFLAGS@
+
+MED_ROOT_DIR=@MED_ROOT_DIR@
+MED_LDFLAGS=@MED_LDFLAGS@
+MED_CXXFLAGS=@MED_CXXFLAGS@
+
 ## Installation points
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-bindir=@bindir@/salome
-libdir=@libdir@/salome
+bindir=@exec_prefix@/bin/salome
+libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome
 # warning : if user give this path in configure we could have salome/salome :-(
 includedir=@includedir@/salome
 datadir=@datadir@/salome
 idldir=${prefix}/idl/salome
-sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
+sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
 incmakedir=${prefix}/salome_adm/unix
 
 docdir=${prefix}/doc/salome

diff --git a/configure.in.base b/configure.in.base
index e4b35d6ec2f1c6c1f3b53f82b09ac53f2c3ee38a..37aa59948c69f645061c7c49816a38011412985c 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -339,7 +339,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep

diff --git a/idl/Makefile.in b/idl/Makefile.in
index b032d41de2c39dca0f6042882a302b2689646c76..7d3dce54cba11976e463b05b618c6ced77e4cafc 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -28,7 +28,7 @@ $(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%)
 
 lib: pyidl
 
-PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
+PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@
 
 pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py)
 

diff --git a/src/CONVERTOR/Makefile.in b/src/CONVERTOR/Makefile.in
index b3bf4147137e221337642361636ea97c7e894ee5..56481d8447825a13583913762f82de653fdc82e8 100644 (file)
--- a/src/CONVERTOR/Makefile.in
+++ b/src/CONVERTOR/Makefile.in
@@ -63,9 +63,9 @@ CPPFLAGS+= -ftemplate-depth-32 \
        $(QT_INCLUDES) \
        $(OCC_INCLUDES) \
        $(OCC_CXXFLAGS) \
-       -I${KERNEL_ROOT_DIR}/include/salome \
-       -I${MED_ROOT_DIR}/include/salome \
-       -I${GUI_ROOT_DIR}/include/salome \
+       $(KERNEL_CXXFLAGS) \
+       $(MED_CXXFLAGS) \
+       $(GUI_CXXFLAGS) \
        $(BOOST_CPPFLAGS)
 
 LDFLAGS+= $(VTK_LIBS) \
@@ -73,8 +73,8 @@ LDFLAGS+= $(VTK_LIBS) \
        $(CAS_KERNEL) \
        $(CAS_MATH) \
        $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} \
-       -L${MED_ROOT_DIR}/lib/salome -lMEDWrapper \
-       -L${GUI_ROOT_DIR}/lib/salome -lVTKViewer
+       $(MED_LDFLAGS) -lMEDWrapper \
+       $(GUI_LDFLAGS) -lVTKViewer
 
 LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lVTKViewer -lsuit -lqtx
 

diff --git a/src/ENGINE/Makefile.in b/src/ENGINE/Makefile.in
index d26a08ba6eb3d0b5c03765f46c2848498cad90d2..8aff0aad71ebf6f24714d9ef75f248732532b25d 100644 (file)
--- a/src/ENGINE/Makefile.in
+++ b/src/ENGINE/Makefile.in
@@ -36,9 +36,9 @@ BIN_SERVER_IDL =
 EXPORT_HEADERS = 
 
 # additionnal information to compil and link file
-CPPFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS += $(KERNEL_CXXFLAGS)
 
-LDFLAGS  += -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer
+LDFLAGS  += $(KERNEL_LDFLAGS) -lSalomeContainer
 
 LIBS+= 
 

diff --git a/src/GUITOOLS/Makefile.in b/src/GUITOOLS/Makefile.in
index eb8eeac45f843cd382d24eb8974b32d0588c4208..da363fe5d88031b86b2e8af1aef0c18d0a34778c 100644 (file)
--- a/src/GUITOOLS/Makefile.in
+++ b/src/GUITOOLS/Makefile.in
@@ -56,11 +56,11 @@ LIB_SERVER_IDL =
 
 CPPFLAGS +=  -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) \
        $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome  $(BOOST_CPPFLAGS)
+       $(KERNEL_CXXFLAGS)  $(BOOST_CPPFLAGS)
 
 CXXFLAGS +=  -ftemplate-depth-32 $(OCC_CXXFLAGS) \
-       -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
 
-LDFLAGS += $(QWT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome
+LDFLAGS += $(QWT_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS)
 
 @CONCLUDE@

diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in
index 0a5cbee80f117cbc7b06b3ede4824e97d5f128ef..2ff5af6415634395fe2f64e1b48351eef23840b1 100644 (file)
--- a/src/OBJECT/Makefile.in
+++ b/src/OBJECT/Makefile.in
@@ -66,15 +66,15 @@ CPPFLAGS+= \
        $(OCC_INCLUDES) \
        $(VTK_INCLUDES) \
        $(BOOST_CPPFLAGS) \
-       -I${MED_ROOT_DIR}/include/salome \
-       -I${GUI_ROOT_DIR}/include/salome \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(MED_CXXFLAGS) \
+       $(GUI_CXXFLAGS) \
+       $(KERNEL_CXXFLAGS)
 
 LDFLAGS+= \
        $(VTK_LIBS)  \
        $(BOOST_LIBS) \
-       -L${GUI_ROOT_DIR}/lib/salome \
-       -L${KERNEL_ROOT_DIR}/lib/salome 
+       $(GUI_LDFLAGS) \
+       $(KERNEL_LDFLAGS) 
 
 LIBS+=  \
        -lboost_signals${BOOST_LIBSUFFIX} \

diff --git a/src/PIPELINE/Makefile.in b/src/PIPELINE/Makefile.in
index 8f775a803f74fa74dccd713f14cb07b61a2e9d19..935c85257d64e26274a84be9fab7152c246b97b0 100644 (file)
--- a/src/PIPELINE/Makefile.in
+++ b/src/PIPELINE/Makefile.in
@@ -96,16 +96,16 @@ BIN_SRC     =
 
 CPPFLAGS+= \
        $(VTK_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome \
-       -I${GUI_ROOT_DIR}/include/salome \
-       -I${MED_ROOT_DIR}/include/salome \
+       $(KERNEL_CXXFLAGS) \
+       $(GUI_CXXFLAGS) \
+       $(MED_CXXFLAGS) \
        $(HDF5_INCLUDES) $(BOOST_CPPFLAGS)
 
 LDFLAGS+= \
        $(VTK_LIBS) -lVTKViewer -lVisuConvertor \
-       -L${KERNEL_ROOT_DIR}/lib/salome -lSALOMELocalTrace \
-       -L${GUI_ROOT_DIR}/lib/salome \
-       -L${MED_ROOT_DIR}/lib/salome
+       $(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+       $(GUI_LDFLAGS) \
+       $(MED_LDFLAGS)
 
 LDFLAGSFORBIN=$(LDFLAGS) -lOpUtil -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase -lmed_V2_1 -lsuit -lqtx -lSALOMEBasics
 

diff --git a/src/VISUGUI/Makefile.in b/src/VISUGUI/Makefile.in
index 3ecc0aef65201f428a40e867c74aaa07426c1e91..f5772732ae25b0e6bc17bfe89cd4faad79c945ed 100644 (file)
--- a/src/VISUGUI/Makefile.in
+++ b/src/VISUGUI/Makefile.in
@@ -119,17 +119,17 @@ LIB_SERVER_IDL =
 
 CPPFLAGS +=  -ftemplate-depth-32 $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) \
        $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome \
-       -I${MED_ROOT_DIR}/include/salome \
+       $(KERNEL_CXXFLAGS) \
+       $(MED_CXXFLAGS) \
        $(BOOST_CPPFLAGS)
 CXXFLAGS +=  -ftemplate-depth-32 $(OCC_CXXFLAGS) \
-       -I${KERNEL_ROOT_DIR}/include/salome \
-       -I${GUI_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS) \
+       $(GUI_CXXFLAGS)
 
 LDFLAGS += $(QWT_LIBS) -lSalomeNS \
        -lSVTK -lVVTK -lSPlot2d -lVisuObject -lVISUEngineImpl -lVISUGUITOOLS \
-       -L${KERNEL_ROOT_DIR}/lib/salome \
-       -L${GUI_ROOT_DIR}/lib/salome
+       $(KERNEL_LDFLAGS) \
+       $(GUI_LDFLAGS)
 
 
 @CONCLUDE@

diff --git a/src/VISU_I/Makefile.in b/src/VISU_I/Makefile.in
index caa661475589d39e3684bb6ef0233a233a383472..7924835cd6e50e2833afe6158c3f7ebfa873ee59 100644 (file)
--- a/src/VISU_I/Makefile.in
+++ b/src/VISU_I/Makefile.in
@@ -98,9 +98,9 @@ CPPFLAGS += \
        $(HDF5_INCLUDES) \
        $(QWT_INCLUDES) \
        $(BOOST_CPPFLAGS)\
-       -I${KERNEL_ROOT_DIR}/include/salome \
-       -I${MED_ROOT_DIR}/include/salome \
-       -I${GUI_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS) \
+       $(MED_CXXFLAGS) \
+       $(GUI_CXXFLAGS)
 
 LDFLAGS  += \
        $(PYTHON_LIBS) \
@@ -108,9 +108,9 @@ LDFLAGS  += \
        $(VTK_LIBS) \
        $(QWT_LIBS) \
        $(BOOST_LIBS) \
-       -L${KERNEL_ROOT_DIR}/lib/salome \
-       -L${GUI_ROOT_DIR}/lib/salome \
-       -L${MED_ROOT_DIR}/lib/salome 
+       $(KERNEL_LDFLAGS) \
+       $(GUI_LDFLAGS) \
+       $(MED_LDFLAGS) 
 
 LIBS+=  -lboost_signals${BOOST_LIBSUFFIX} \
        -lSalomeHDFPersist \
@@ -132,7 +132,7 @@ LIBS+=  -lboost_signals${BOOST_LIBSUFFIX} \
        -lVISUGUITOOLS
 
 LDFLAGSFORBIN=$(LDFLAGS) $(LIBS) \
-       -L${KERNEL_ROOT_DIR}/lib/salome \
+       $(KERNEL_LDFLAGS) \
        -lSALOMEBasics \
        -lSalomeCatalog \
        -lwith_loggerTraceCollector \

diff --git a/src/VISU_SWIG/Makefile.in b/src/VISU_SWIG/Makefile.in
index 35420a584a1e6edc8075e9fd7aa522decb488273..31dc31416d3a543ab3e1c23aad2ebbb56f54011c 100644 (file)
--- a/src/VISU_SWIG/Makefile.in
+++ b/src/VISU_SWIG/Makefile.in
@@ -55,9 +55,9 @@ CPPFLAGS += -ftemplate-depth-32 \
        $(HDF5_INCLUDES) \
        $(QT_INCLUDES) \
        $(VTK_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome \
-       -I${GUI_ROOT_DIR}/include/salome \
-       -I${MED_ROOT_DIR}/include/salome \
+       $(KERNEL_CXXFLAGS) \
+       $(GUI_CXXFLAGS) \
+       $(MED_CXXFLAGS) \
        $(BOOST_CPPFLAGS)
 
 LDFLAGS += $(PYTHON_LIBS) -lVisuConvertor -lVisuPipeLine

diff --git a/src/VVTK/Makefile.in b/src/VVTK/Makefile.in
index 66b48653a131c88c9f337b424085efa3350d2cd5..ed645011434ad1bb9eeaff01b9ec8ad103208562 100755 (executable)
--- a/src/VVTK/Makefile.in
+++ b/src/VVTK/Makefile.in
@@ -63,16 +63,16 @@ CPPFLAGS += \
        $(OCC_INCLUDES) \
        $(VTK_INCLUDES) \
        $(BOOST_CPPFLAGS) \
-       -I$(KERNEL_ROOT_DIR)/include/salome \
-       -I$(GUI_ROOT_DIR)/include/salome \
-       -I${MED_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS) \
+       $(GUI_CXXFLAGS) \
+       $(MED_CXXFLAGS)
 
 LDFLAGS += \
        $(QT_MT_LIBS) \
        $(OCC_LIBS) \
        $(VTK_LIBS) \
-       -L$(KERNEL_ROOT_DIR)/lib/salome \
-       -L$(GUI_ROOT_DIR)/lib/salome
+       $(KERNEL_LDFLAGS) \
+       $(GUI_LDFLAGS)
 
 LIBS+= -lsuit -lCAM -lSalomeObject -lSVTK -lOpUtil