Porting to 64bit platform

diff --git a/adm_local/unix/config_files/check_SUPERV.m4 b/adm_local/unix/config_files/check_SUPERV.m4
index 0ac2ba066fa463c621c53ec8dbf439b9d3ac87a1..589649f66674b4dd15e643e3512f1a0b6bf21b09 100755 (executable)
--- a/adm_local/unix/config_files/check_SUPERV.m4
+++ b/adm_local/unix/config_files/check_SUPERV.m4
@@ -9,6 +9,9 @@ AC_CHECKING(for Superv)
 
 Superv_ok=no
 
+SUPERV_LDFLAGS=""
+SUPERV_CXXFLAGS=""
+
 AC_ARG_WITH(superv,
            --with-superv=DIR root directory path of SUPERV installation,
            SUPERV_DIR="$withval",SUPERV_DIR="")
@@ -43,6 +46,13 @@ if test -f ${SUPERV_DIR}/lib/salome/libSUPERV.so  ; then
     SUPERV_ROOT_DIR=${SUPERV_DIR}
   fi
   AC_SUBST(SUPERV_ROOT_DIR)
+
+  SUPERV_LDFLAGS=-L${SUPERV_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+  SUPERV_CXXFLAGS=-I${SUPERV_DIR}/include/salome
+
+  AC_SUBST(SUPERV_LDFLAGS)
+  AC_SUBST(SUPERV_CXXFLAGS)
+
 else
   AC_MSG_WARN("Cannot find compiled SUPERV distribution")
 fi

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index b63301d57213ab4c31ed71391035da830ce62988..3e8f8b8f34959ad4aeb7620bae959090989a8026 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -8,11 +8,10 @@ SHELL=/bin/sh
 
 HAVE_SSTREAM=@HAVE_SSTREAM@
 
-
 LIBS=@LIBS@ 
 LIBSFORBIN=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib/salome
-LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
+LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
 # add libstdc++ to link c++ library with libtool !
 LDFLAGS+= -lstdc++
 LDFLAGSFORBIN+= -lstdc++
@@ -56,8 +55,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@
@@ -202,16 +201,26 @@ 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@
+
 ## 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 0749b450ea33c175aad7ad0315867ea908fbc113..ae9739a74a147af6d2830ab0830134d6af4ec826 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -327,7 +327,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 e451185226ee07754f315339f0d95d9f8450ebc4..5915f680e7ba15986a242374e43c9d105928737f 100644 (file)
--- a/idl/Makefile.in
+++ b/idl/Makefile.in
@@ -48,7 +48,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/GraphBase/Makefile.in b/src/GraphBase/Makefile.in
index 42a65e86311d2d2f8037615289c6cd6f74f1f4c6..7a88c3925698d37e5b2838c53119612326ab75b0 100644 (file)
--- a/src/GraphBase/Makefile.in
+++ b/src/GraphBase/Makefile.in
@@ -30,34 +30,34 @@ top_srcdir=@top_srcdir@
 top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
-
+# KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
 
 @COMMENCE@
 
 EXPORT_HEADERS = \
-               DataFlowBase_Base.hxx \
-               DataFlowBase_ServicesParameter.hxx \
-               DataFlowBase_Port.hxx \
-               DataFlowBase_DataPort.hxx \
-               DataFlowBase_InPort.hxx \
-               DataFlowBase_InDataStreamPort.hxx \
-               DataFlowBase_OutPort.hxx \
-               DataFlowBase_OutDataStreamPort.hxx \
-               DataFlowBase_Service.hxx \
-               DataFlowBase_PortsOfNode.hxx \
-               DataFlowBase_StreamNode.hxx \
-               DataFlowBase_ComputingNode.hxx \
-               DataFlowBase_FactoryNode.hxx \
-               DataFlowBase_InLineNode.hxx \
-               DataFlowBase_GOTONode.hxx \
-               DataFlowBase_LoopNode.hxx \
-               DataFlowBase_EndOfLoopNode.hxx \
-               DataFlowBase_SwitchNode.hxx \
-               DataFlowBase_EndOfSwitchNode.hxx \
-               DataFlowBase_DataNode.hxx \
-               DataFlowBase_XmlHandler.hxx \
-               DataFlowBase_Graph.hxx \
-               DataFlowBase_StreamGraph.hxx
+       DataFlowBase_Base.hxx \
+       DataFlowBase_ServicesParameter.hxx \
+       DataFlowBase_Port.hxx \
+       DataFlowBase_DataPort.hxx \
+       DataFlowBase_InPort.hxx \
+       DataFlowBase_InDataStreamPort.hxx \
+       DataFlowBase_OutPort.hxx \
+       DataFlowBase_OutDataStreamPort.hxx \
+       DataFlowBase_Service.hxx \
+       DataFlowBase_PortsOfNode.hxx \
+       DataFlowBase_StreamNode.hxx \
+       DataFlowBase_ComputingNode.hxx \
+       DataFlowBase_FactoryNode.hxx \
+       DataFlowBase_InLineNode.hxx \
+       DataFlowBase_GOTONode.hxx \
+       DataFlowBase_LoopNode.hxx \
+       DataFlowBase_EndOfLoopNode.hxx \
+       DataFlowBase_SwitchNode.hxx \
+       DataFlowBase_EndOfSwitchNode.hxx \
+       DataFlowBase_DataNode.hxx \
+       DataFlowBase_XmlHandler.hxx \
+       DataFlowBase_Graph.hxx \
+       DataFlowBase_StreamGraph.hxx
 
 # Libraries targets
 LIB = libSalomeSuperVisionBase.la
@@ -87,30 +87,25 @@ LIB_SRC = \
        DataFlowBase_StreamGraph.cxx
 
 LIB_CLIENT_IDL = Logger.idl \
-                SALOME_ModuleCatalog.idl \
-                SALOME_Component.idl \
-                SALOMEDS.idl \
-                SUPERV.idl \
-                SALOMEDS_Attributes.idl \
-                SALOME_Exception.idl \
-                SALOME_GenericObj.idl
+       SALOME_ModuleCatalog.idl \
+       SALOME_Component.idl \
+       SALOMEDS.idl \
+       SUPERV.idl \
+       SALOMEDS_Attributes.idl \
+       SALOME_Exception.idl \
+       SALOME_GenericObj.idl
 # Executables targets
 BIN = SuperVisionBase_CheckOfUndefined
 BIN_SRC = 
 BIN_SERVER_IDL = 
 
 CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
-       -I${KERNEL_ROOT_DIR}/include/salome
-
-ifeq ($(OS),REDHAT)
-       CXXFLAGS+= -DREDHAT
-endif
-
-LDFLAGS= -L../../lib/salome $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \
+       $(KERNEL_CXXFLAGS)
+LDFLAGS+= $(SUPERV_LDFLAGS) $(CORBA_LIBS) -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace \
        -lc $(PYTHON_LIBS) $(QT_MT_LIBS) $(OGL_LIBS) \
-       -L${KERNEL_ROOT_DIR}/lib/salome
+       $(KERNEL_LDFLAGS)
 LDFLAGSFORBIN=$(LDFLAGS) -lSalomeContainer -lSalomeResourcesManager -lRegistry -lSalomeNotification -lSALOMEBasics
 //LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 

diff --git a/src/GraphEditor/Makefile.in b/src/GraphEditor/Makefile.in
index d5223cade1aa5729cb890b0e0d32b0e58cfa8bfd..8b476379258cae900d08f89b13c2182423794621 100644 (file)
--- a/src/GraphEditor/Makefile.in
+++ b/src/GraphEditor/Makefile.in
@@ -31,7 +31,6 @@ top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@:@top_srcdir@/idl
 
-
 @COMMENCE@
 
 EXPORT_HEADERS = \
@@ -60,11 +59,11 @@ BIN_SRC =
 BIN_SERVER_IDL = 
 
 CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lOpUtil -lSALOMELocalTrace \
-       -lc $(QT_MT_LIBS) $(OGL_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
+       -lc $(QT_MT_LIBS) $(OGL_LIBS) $(KERNEL_LDFLAGS)
 #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 
 

diff --git a/src/GraphExecutor/Makefile.in b/src/GraphExecutor/Makefile.in
index e0486d6e8ef765e75923007c8cba991e6f914eba..45f58df7394b61b290ce09b96dce848f88bc2927 100644 (file)
--- a/src/GraphExecutor/Makefile.in
+++ b/src/GraphExecutor/Makefile.in
@@ -47,17 +47,17 @@ BIN_SRC =
 BIN_SERVER_IDL = 
 
 CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 
-ifeq ($(OS),REDHAT)
+feq ($(OS),REDHAT)
        CXXFLAGS+= -DREDHAT
 endif
 
 LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionEditor -lOpUtil -lSALOMELocalTrace\
        -lc $(QT_MT_LIBS) $(OGL_LIBS) \
-       -L${KERNEL_ROOT_DIR}/lib/salome
+       $(KERNEL_LDFLAGS)
 #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 
 

diff --git a/src/SUPERVGUI/Makefile.in b/src/SUPERVGUI/Makefile.in
index 207a757aa05348199563fe67e7c8d9172f53b2f5..695cdd9417299663097d3514250a33aef9553135 100644 (file)
--- a/src/SUPERVGUI/Makefile.in
+++ b/src/SUPERVGUI/Makefile.in
@@ -99,11 +99,11 @@ LIB_CLIENT_IDL = SALOMEDS.idl                \
 LIB_SERVER_IDL = 
 
 CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) \
-         -ftemplate-depth-42 -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome 
+         -ftemplate-depth-42 $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS)
 LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) \
         -lSalomeApp -lsuit -lSalomeNS -lEvent \
         -lSalomeLifeCycleCORBA -lSalomeNotification -lSUPERVGraph \
-        -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeDS -lSalomeDSClient -L${GUI_ROOT_DIR}/lib/salome
+        $(KERNEL_LDFLAGS) -lSalomeDS -lSalomeDSClient $(GUI_LDFLAGS)
 #-lqsplitterP
 LIBS+= 
 

diff --git a/src/Supervision/Makefile.in b/src/Supervision/Makefile.in
index b2267442cbd38dc4d29a6e2a439e9556acbab1da..12327a28c355326d2761e9ace1cd4dca00aaeb31 100755 (executable)
--- a/src/Supervision/Makefile.in
+++ b/src/Supervision/Makefile.in
@@ -89,16 +89,16 @@ BIN_SRC =
 BIN_SERVER_IDL = 
 
 CPPFLAGS+= $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS)\
-       -I${KERNEL_ROOT_DIR}/include/salome
+       $(KERNEL_CXXFLAGS)
 CXXFLAGS += -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \
-       -I${KERNEL_ROOT_DIR}/include/salome -L$(top_builddir)/lib/salome
+       $(KERNEL_CXXFLAGS) $(SUPERV_LDFLAGS)
 LDFLAGS+= -lSalomeSuperVisionEditor -lSalomeSuperVisionExecutor -lSalomeSuperVisionBase \
        -lSalomeContainer -lSalomeNotification -lSalomeNS -lSalomeLifeCycleCORBA \
        -lOpUtil -lRegistry -lTOOLSDS -lSALOMELocalTrace \
-       $(QT_MT_LIBS) -L${KERNEL_ROOT_DIR}/lib/salome
+       $(QT_MT_LIBS) $(KERNEL_LDFLAGS)
 #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 
-LDFLAGSFORBIN += $(LDFLAGS) -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeResourcesManager -lSALOMEBasics
+LDFLAGSFORBIN += $(LDFLAGS) $(KERNEL_LDFLAGS) -lSalomeResourcesManager -lSALOMEBasics
 #LIBSFORBIN += $(LIBS)
 
 @CONCLUDE@