Porting on Mandriva 64 (to unify libdir usage)

diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index ad022e400f3a5d5c4e4a76b19258a3beca14f09b..ff090e7b9b843f8e6b63eb3e3fb934fcf5e5a0b8 100755 (executable)
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.m4
@@ -3,51 +3,61 @@
 #  Author : Marc Tajchman (CEA, 2002)
 #------------------------------------------------------------
 
-AC_DEFUN([CHECK_SALOME_GUI],[
+AC_DEFUN([CHECK_GUI],[
+AC_REQUIRE([AC_LINKER_OPTIONS])dnl
 
-AC_CHECKING(for SalomeGUI)
+AC_CHECKING(for $2 $1 )
 
 SalomeGUI_ok=no
 
+GUI_LDFLAGS=""
+GUI_CXXFLAGS=""
+
 AC_ARG_WITH(gui,
            --with-salome_gui=DIR root directory path of SALOME GUI installation,
            SALOME_GUI_DIR="$withval",SALOME_GUI_DIR="")
 
-if test "x$SALOME_GUI_DIR" = "x" ; then
-
-# no --with-gui-dir option used
-
-  if test "x$GUI_ROOT_DIR" != "x" ; then
-
+if test "x${SALOME_GUI_DIR}" = "x" ; then
+  # no --with-gui-dir option used
+  AC_MSG_RESULT(try \${GUI_ROOT_DIR}: ${GUI_ROOT_DIR})
+  if test "x${GUI_ROOT_DIR}" != "x" ; then
     # SALOME_ROOT_DIR environment variable defined
-    SALOME_GUI_DIR=$GUI_ROOT_DIR
-
+    SALOME_GUI_DIR=${GUI_ROOT_DIR}
   else
-
     # search Salome binaries in PATH variable
-    AC_PATH_PROG(TEMP, libLightApp.so)
-    if test "x$TEMP" != "x" ; then
-      SALOME_BIN_DIR=`dirname $TEMP`
-      SALOME_GUI_DIR=`dirname $SALOME_BIN_DIR`
+    AC_PATH_PROG(TEMP, $1)
+    if test "x${TEMP}" != "x" ; then
+      AC_MSG_RESULT(libLightApp.so was found at : ${TEMP})
+      SALOME_BIN_DIR=`dirname ${TEMP}`
+      SALOME_GUI_DIR=`cd ${SALOME_BIN_DIR}/../..; pwd`
     fi
-
   fi
-#
 fi
 
-if test -f ${SALOME_GUI_DIR}/lib/salome/libLightApp.so  ; then
+if test -f ${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome/$1 ; then
   SalomeGUI_ok=yes
   AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR})
 
-  if test "x$GUI_ROOT_DIR" == "x" ; then
+  if test "x${GUI_ROOT_DIR}" == "x" ; then
     GUI_ROOT_DIR=${SALOME_GUI_DIR}
   fi
+
   AC_SUBST(GUI_ROOT_DIR)
+
+  GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+  GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome
+
+  AC_SUBST(GUI_LDFLAGS)
+  AC_SUBST(GUI_CXXFLAGS)
 else
   AC_MSG_WARN("Cannot find compiled SALOME GUI distribution")
 fi
   
-AC_MSG_RESULT(for SALOME GUI: $SalomeGUI_ok)
+AC_MSG_RESULT(for $2: ${SalomeGUI_ok})
  
 ])dnl
- 
+
+AC_DEFUN([CHECK_SALOME_GUI],[
+  CHECK_GUI([libLightApp.so],
+            [SALOME GUI])
+])dnl
\ No newline at end of file

diff --git a/adm_local/unix/config_files/check_corba_in_GUI.m4 b/adm_local/unix/config_files/check_corba_in_GUI.m4
index 007dfc6c5bcbe86d3314abed334fe947db401acb..20be4514f656afa19b0dd366bb2319877be80a2d 100755 (executable)
--- a/adm_local/unix/config_files/check_corba_in_GUI.m4
+++ b/adm_local/unix/config_files/check_corba_in_GUI.m4
@@ -4,52 +4,9 @@
 #------------------------------------------------------------
 
 AC_DEFUN([CHECK_CORBA_IN_GUI],[
-
-AC_CHECKING(for full SalomeGUI)
-
-SalomeGUI_ok=no
-CORBA_IN_GUI="no"
-
-AC_ARG_WITH(gui,
-           --with-salome_gui=DIR root directory path of full SALOME GUI installation,
-           SALOME_GUI_DIR="$withval",SALOME_GUI_DIR="")
-
-if test "x$SALOME_GUI_DIR" = "x" ; then
-
-# no --with-gui-dir option used
-
-  if test "x$GUI_ROOT_DIR" != "x" ; then
-
-    # SALOME_ROOT_DIR environment variable defined
-    SALOME_GUI_DIR=$GUI_ROOT_DIR
-
-  else
-
-    # search Salome binaries in PATH variable
-    AC_PATH_PROG(TEMP, libSalomeApp.so)
-    if test "x$TEMP" != "x" ; then
-      SALOME_BIN_DIR=`dirname $TEMP`
-      SALOME_GUI_DIR=`dirname $SALOME_BIN_DIR`
-    fi
-
-  fi
-#
-fi
-
-if test -f ${SALOME_GUI_DIR}/lib/salome/libSalomeApp.so  ; then
-  SalomeGUI_ok=yes
-  CORBA_IN_GUI=yes
-  AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR})
-
-  if test "x$GUI_ROOT_DIR" == "x" ; then
-    GUI_ROOT_DIR=${SALOME_GUI_DIR}
-  fi
-else
-  AC_MSG_WARN("Cannot find compiled full SALOME GUI distribution")
-fi
-AC_SUBST(CORBA_IN_GUI)
-  
-AC_MSG_RESULT(for full SALOME GUI: $SalomeGUI_ok)
- 
+  CHECK_GUI([libSalomeApp.so],
+            [CORBA SALOME GUI])
+  CORBA_IN_GUI=${SalomeGUI_ok}
+  AC_SUBST(CORBA_IN_GUI)
 ])dnl
  

diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4
index ba72a02d4b6c95fcf41399b0b5a32141cadb44ed..ab5348319f74ebd2bcf6e7cfd168e4f63b5791bd 100644 (file)
--- a/adm_local/unix/config_files/check_qt.m4
+++ b/adm_local/unix/config_files/check_qt.m4
@@ -28,7 +28,7 @@ AC_REQUIRE([AC_PROG_CXXCPP])dnl
 AC_REQUIRE([CHECK_OPENGL])dnl
 AC_REQUIRE([AC_LINKER_OPTIONS])dnl
 
-AC_CHECKING(for QT)
+AC_CHECKING(for Qt)
 
 if test "x$OpenGL_ok" != "xyes" ; then
    AC_MSG_WARN(Qt needs OpenGL correct configuration, check configure output)
@@ -173,7 +173,7 @@ AC_SUBST(QT_VERS)
 
 AC_LANG_RESTORE
 
-AC_MSG_RESULT(for qt: $qt_ok)
+AC_MSG_RESULT(for Qt: $qt_ok)
 
 # Save cache
 AC_CACHE_SAVE

diff --git a/adm_local/unix/config_files/check_vtk.m4 b/adm_local/unix/config_files/check_vtk.m4
index e124c071aa35f1ba9dd13b960011afa07c851125..a0733ebc35f45fbb17b929c86fd4bd588085e2bc 100644 (file)
--- a/adm_local/unix/config_files/check_vtk.m4
+++ b/adm_local/unix/config_files/check_vtk.m4
@@ -135,7 +135,7 @@ else
   VTK_MT_LIBS="$LOCAL_LIBS"
 fi
 
-AC_MSG_RESULT(for vtk: $vtk_ok)
+AC_MSG_RESULT(for VTK: $vtk_ok)
 
 AC_LANG_RESTORE
 

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 6eac40541be9780be14bebba8905a2a81aa8b8d0..0ad54cad47e936fe9326e77ce967c7ab302c5ecc 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -19,8 +19,8 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 LIBS=@LIBS@ 
 LIBSFORBIN=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
-LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(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++
@@ -62,8 +62,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@
@@ -116,12 +116,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_MATH=@CAS_MATH@
 CAS_OCAF=@CAS_OCAF@
@@ -131,6 +125,7 @@ CAS_VIEWER=@CAS_VIEWER@
 CAS_MODELER=@CAS_MODELER@
 CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@
 CAS_LDPATH=@CAS_LDPATH@
+
 # MPICH
 
 MPICH_INCLUDES=@MPICH_INCLUDES@
@@ -183,10 +178,6 @@ IDL_SRV_OBJ = @IDL_SRV_OBJ@
 CPPFLAGS+= $(CORBA_INCLUDES) 
 CXXFLAGS+= $(CORBA_CXXFLAGS)
 
-# add corba libs when link salome application ! 
-#LDFLAGS+= $(CORBA_LIBS)
-#LIBS+=$(CORBA_LIBS)
-
 DOXYGEN = @DOXYGEN@
 DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@
 DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@
@@ -211,16 +202,22 @@ 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@
+
 ## 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/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in
index c79350747cc0dd1bf2df872099c46d5d198f10cc..b10f5dbc06521d053ef1a4b3feb636867cd0e44d 100644 (file)
--- a/adm_local/unix/make_conclude.in
+++ b/adm_local/unix/make_conclude.in
@@ -48,10 +48,10 @@ LIB_OBJ_F    = $(patsubst %.f,   %.lo, $(filter %.f, $(LIB_SRC)))
 # all libtool obj file in library
 LIB_OBJ = $(LIB_OBJ_CXX) $(LIB_OBJ_CC) $(LIB_OBJ_C) $(LIB_CLIENT_OBJ:%.o=%.lo) $(LIB_SERVER_OBJ:%.o=%.lo) $(LIB_SWIG_OBJ) $(LIB_OBJ_F)
 
-# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib/salome/%.la)
-LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib/salome/%.la, $(filter %.la, $(LIB)))
-LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib/salome/%.a, $(filter %.a, $(LIB)))
-LIB_BUILD_SO = $(patsubst %.so, $(top_builddir)/lib/salome/%.so, $(filter %.so, $(LIB)))
+# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la)
+LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la, $(filter %.la, $(LIB)))
+LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a, $(filter %.a, $(LIB)))
+LIB_BUILD_SO = $(patsubst %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.so, $(filter %.so, $(LIB)))
 
 ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),)
 ifneq ($(GUI_DISABLE_CORBA),yes)
@@ -66,7 +66,7 @@ endif
 lib: $(LIB_BUILD) $(LIB_BUILD_SO) $(LIB_CLIENT_PY)
 # we don't build static library !
 
-$(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la
+$(LIB_BUILD): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la: %.la
        -$(RM) $@
        -$(RM) $(patsubst %.la, %.so, $@)
        -$(RM) $(patsubst %.la, %.a, $@)
@@ -77,14 +77,14 @@ $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la
              $(patsubst %.la, %.so, $@).0 || true
 
        if ! test -z $(LIB_SWIG) ; then \
-          ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib/salome/_$(LIB_SWIG) || true;\
+          ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/_$(LIB_SWIG) || true;\
        fi;
 
-$(LIB_BUILD_A): $(top_builddir)/lib/salome/%.a: %.a
+$(LIB_BUILD_A): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a: %.a
        -$(RM) $@
        ln -sf $(CURDIR)/$< $@ || true
 
-$(LIB_BUILD_SO): $(top_builddir)/lib/salome/%.so: %.so
+$(LIB_BUILD_SO): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.so: %.so
        -$(RM) $@
        ln -sf $(CURDIR)/$< $@ || true
 
@@ -154,7 +154,7 @@ $(DEST_UI_PY_FILES): $(top_builddir)/bin/salome/%: %
 
 # copy pyqt files in $(PYTHON_SHARED_SITE)
 #
-PYTHON_SHARED_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
+PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
 
 $(PYTHON_SHARED_SITE):
        $(INSTALL) -d  $@
@@ -343,10 +343,10 @@ clean: mostlyclean
        -$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN)
        -$(RM) TAGS *~ *# core *.core 
        -$(RM) -r .libs
-       -$(RM) $(top_builddir)/lib/salome/$(LIB)
+       -$(RM) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)
        -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN))
-       -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib/salome/$(LIB))
-       -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib/salome/$(LIB))
+       -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB))
+       -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB))
 # remove idl generated files (sources)
        -$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC)
 # remove idl generated files (headers)

diff --git a/configure.in.base b/configure.in.base
index f593bc607567fcd988f60fd1b1ace9635070f1c7..86fc9ff5dbac9f8dc0c9a41e83122329eea629e7 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -512,9 +512,9 @@ fi
 
 # make other build directories
 if test "$GUI_DISABLE_CORBA" == "yes"; then 
-dir_variables="salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl"
+  dir_variables="salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl"
 else
-dir_variables="salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources"
+  dir_variables="salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources"
 fi
 
 for rep in $dir_variables

diff --git a/src/Event/Makefile.in b/src/Event/Makefile.in
index b9fde9c860ec9d789e159ee8cc152f2fd79dfce8..4fb782f57abe41207872abccea5caab7b04bf194 100755 (executable)
--- a/src/Event/Makefile.in
+++ b/src/Event/Makefile.in
@@ -45,7 +45,7 @@ EXPORT_PYSCRIPTS =
 LIB = libEvent.la 
 LIB_SRC = SALOME_Event.cxx 
 
-CPPFLAGS+=$(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+=$(QT_INCLUDES) $(KERNEL_CXXFLAGS)
 LDFLAGS+=$(QT_MT_LIBS)
 
 @CONCLUDE@

diff --git a/src/GLViewer/Makefile.in b/src/GLViewer/Makefile.in
index ef505528f434d37f80735db3870929a515e82bfd..3a3634256ebf52bd1a5a725191eb4345c5377860 100644 (file)
--- a/src/GLViewer/Makefile.in
+++ b/src/GLViewer/Makefile.in
@@ -98,6 +98,6 @@ CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES)
 
 LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL)
 
-LIBS+= -L${GUI_ROOT_DIR}/lib/salome -lsuit -L/usr/X11R6/lib@LIB_LOCATION_SUFFIX@ -lGLU
+LIBS+= -lsuit -L/usr/X11R6/lib@LIB_LOCATION_SUFFIX@ -lGLU
 
 @CONCLUDE@

diff --git a/src/LightApp/Makefile.in b/src/LightApp/Makefile.in
index c26adb88277cf96a7d0f07fa74787c0b083e2e06..612a335f1628b2844b5e26ba94e14e7e1f22fdda 100755 (executable)
--- a/src/LightApp/Makefile.in
+++ b/src/LightApp/Makefile.in
@@ -135,7 +135,7 @@ RESOURCES_FILES = icon_about.png \
                  LightApp.xml
 
 CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(OCC_INCLUDES) \
-       $(HDF5_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
+       $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS)
 
 ifneq ($(DISABLE_VTKVIEWER),yes)
   CPPFLAGS+= $(VTK_INCLUDES)
@@ -171,7 +171,7 @@ ifneq ($(DISABLE_PYCONSOLE),yes)
 endif
 
 LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lLogWindow $(CAS_KERNEL) -lSalomePrs \
-       $(HDF5_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeHDFPersist
+       $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist
 
 ifneq ($(DISABLE_SALOMEOBJECT),yes)
   LIBS+= -lSalomeObject

diff --git a/src/RegistryDisplay/Makefile.in b/src/RegistryDisplay/Makefile.in
index aa0a8550ef2d853a12a8c099feeb476abda666bf..77f61b06807194b5392ffe4f28fd3b0cfa143332 100755 (executable)
--- a/src/RegistryDisplay/Makefile.in
+++ b/src/RegistryDisplay/Makefile.in
@@ -52,8 +52,8 @@ LIB_MOC = RegWidget.h
 
 LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
 
-CPPFLAGS+=$(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
-LDFLAGS+=$(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil
+CPPFLAGS+=$(QT_INCLUDES) $(KERNEL_CXXFLAGS)
+LDFLAGS+=$(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil
 
 
 @CONCLUDE@

diff --git a/src/SALOME_PY/Makefile.in b/src/SALOME_PY/Makefile.in
index a9bd30e9509f16f878dadea204273db6aa011720..7101c82d4252a9571905c7fef205c03f60e00e89 100755 (executable)
--- a/src/SALOME_PY/Makefile.in
+++ b/src/SALOME_PY/Makefile.in
@@ -44,7 +44,7 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
                 SALOME_Exception.idl \
                 SALOME_GenericObj.idl
 
-CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -DHAVE_CONFIG_H
+CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H
 LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeApp -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython
 # -lVTKViewer
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
index d5481f52ae95e024a12c412bbe9fd8b0843afb37..7104c860179fe8a2df710ff7fcd22012b4f2d1af 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in
@@ -63,7 +63,7 @@ LIB_CLIENT_IDL = SALOME_Exception.idl \
                  SALOME_ContainerManager.idl \
                  SALOME_Component.idl 
 
-CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H -I${KERNEL_ROOT_DIR}/include/salome -D__CALL_OLD_METHODS__
+CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS) -D__CALL_OLD_METHODS__
 
 LIBS     += $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS)
 LDFLAGS  += -lPyInterp -lSalomeApp

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.in b/src/SALOME_PYQT/SalomePyQt/Makefile.in
index ac2aeab566e7d3a6ff30577d4ed2ed1312ae6dae..5de10a238a5907bcee947c42bd24b9fcc5a9a31e 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.in
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.in
@@ -101,7 +101,7 @@ LIB_MOC = SalomePyQt.h
 LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl
 
 # Compilation/linkage flags
-CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS)
 LIBS     += $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS)
 LDFLAGS  += -lsuit -lCAM -lstd -lqtx -lSalomeApp -lSalomeSession -lEvent -lLogWindow -lVTKViewer -lToolsGUI -lSalomePyQtGUI
 

diff --git a/src/SALOME_SWIG/Makefile.in b/src/SALOME_SWIG/Makefile.in
index f8bbe46229204762d13632a640f1fb0fb6deec40..0c757d00520b3b24af79de8c3779645f561f4232 100755 (executable)
--- a/src/SALOME_SWIG/Makefile.in
+++ b/src/SALOME_SWIG/Makefile.in
@@ -50,7 +50,7 @@ EXPORT_PYSCRIPTS = libSALOME_Swig.py examplevtk1.py supervisionexample.py superv
 
 EXPORT_SHAREDPYSCRIPTS=SALOMEGUI_shared_modules.py
 
-CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS)
 LIBS+= $(PYTHON_LIBS)
 LDFLAGS+= -lSalomeApp
 

diff --git a/src/SPlot2d/Makefile.in b/src/SPlot2d/Makefile.in
index 44334e80b2d513310d0044530ae3aaa4c063d9ac..80c3cdc3db672eb45512833896103740c3d00cf3 100644 (file)
--- a/src/SPlot2d/Makefile.in
+++ b/src/SPlot2d/Makefile.in
@@ -27,18 +27,6 @@ LIB_SRC =      \
 LIB_MOC = \
           SPlot2d_ViewModel.h
 
-#LIB_CLIENT_IDL = SALOMEDS.idl \
-#               SALOME_Exception.idl \
-#               SALOME_GenericObj.idl
-
-#LIB_CLIENT_IDL = SALOMEDS.idl \
-#               SALOME_ModuleCatalog.idl \
-#               SALOME_Component.idl \
-#               SALOME_ContainerManager.idl \
-#               SALOME_Exception.idl \
-#               SALOME_GenericObj.idl
-
-#CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(OGL_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome
 CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(QWT_INCLUDES) $(BOOST_CPPFLAGS)
 LDFLAGS+=$(QT_MT_LIBS) $(QWT_LIBS) -lsuit -lPlot2d -lSalomePrs
 

diff --git a/src/SUPERVGraph/Makefile.in b/src/SUPERVGraph/Makefile.in
index 8772d041e3ea8b14c527f32b87d2a44705bb5d1b..fa8aa4de07bf075a88c6f5b847109007da6000a3 100755 (executable)
--- a/src/SUPERVGraph/Makefile.in
+++ b/src/SUPERVGraph/Makefile.in
@@ -34,7 +34,7 @@ RESOURCES_FILES = view_pan.png \
 
 LIB_CLIENT_IDL = 
 
-CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS)
 LDFLAGS+=$(QT_MT_LIBS) -L$(top_builddir)/lib -lsuit
 
 

diff --git a/src/SalomeApp/Makefile.in b/src/SalomeApp/Makefile.in
index 8913a2b442d564607a964553b2ce49f2544ab9f7..2755feeeccccf7a8965fc6635b1e5622f503de41 100755 (executable)
--- a/src/SalomeApp/Makefile.in
+++ b/src/SalomeApp/Makefile.in
@@ -67,10 +67,10 @@ LIB_CLIENT_IDL = SALOMEDS.idl \
 RESOURCES_FILES = SalomeApp.ini \
                  SalomeApp.xml
 
-CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS)
 
 LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) 
-LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lSalomePrs -L$(KERNEL_ROOT_DIR)/lib/salome -lOpUtil -lSALOMELocalTrace -lSalomeDSClient $(CAS_KERNEL) -lSPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lLightApp -lSalomeContainer -lToolsGUI
+LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lSalomePrs $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient $(CAS_KERNEL) -lSPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lLightApp -lSalomeContainer -lToolsGUI
 
 @CONCLUDE@
 

diff --git a/src/SalomeApp/Test/Makefile.in b/src/SalomeApp/Test/Makefile.in
index 93e6b8dcdad4c82099e8331c52199664aad133b9..850cc4f5abba321d75076f085984589a312cea04 100644 (file)
--- a/src/SalomeApp/Test/Makefile.in
+++ b/src/SalomeApp/Test/Makefile.in
@@ -51,8 +51,8 @@ BIN_SRC =
 BIN_CLIENT_IDL =
 
 
-CXXFLAGS += $ @CPPUNIT_INCLUDES@ -I${KERNEL_ROOT_DIR}/include/salome
-CPPFLAGS += $ @CPPUNIT_INCLUDES@ -I${KERNEL_ROOT_DIR}/include/salome
+CXXFLAGS += $ @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS)
+CPPFLAGS += $ @CPPUNIT_INCLUDES@ $(KERNEL_CXXFLAGS)
 
 LIBS= @LIBS@ @CPPUNIT_LIBS@
 

diff --git a/src/Session/Makefile.in b/src/Session/Makefile.in
index 22837fbc87dc9ba46fd64fa212cf23556db00c23..bfba470997c85e8b364b353b21fe439a13bec3cb 100755 (executable)
--- a/src/Session/Makefile.in
+++ b/src/Session/Makefile.in
@@ -58,9 +58,9 @@ LIB_SERVER_IDL = SALOME_Session.idl SalomeApp_Engine.idl
 BIN_SERVER_IDL = 
 BIN_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Registry.idl SALOME_ModuleCatalog.idl SALOME_Exception.idl SALOME_GenericObj.idl
 
-CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(OCC_INCLUDES)
+CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -I$(OCC_INCLUDES)
 CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS)
-LDFLAGS += $(QT_MT_LIBS) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL)
+LDFLAGS += $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL)
 
 LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics
 

diff --git a/src/Style/Makefile.in b/src/Style/Makefile.in
index 1c79d289174d7015ff6bf82b84970c4875cd397f..678b7469a42bca15062a2723d642ff2ab3df7956 100644 (file)
--- a/src/Style/Makefile.in
+++ b/src/Style/Makefile.in
@@ -55,7 +55,7 @@ $(INSTALL_PLUGINDIR):
        mkdir -p $@
 
 $(INSTALL_COPYLIB):
-       (cd $(bindir)/styles; ln -sf $(patsubst %.la, ../../../lib/salome/%.so, $(filter %.la, $(LIB))) $@) || true
+       (cd $(bindir)/styles; ln -sf $(patsubst %.la, ../../../lib@LIB_LOCATION_SUFFIX@/salome/%.so, $(filter %.la, $(LIB))) $@) || true
 
 @CONCLUDE@
 

diff --git a/src/TOOLSGUI/Makefile.in b/src/TOOLSGUI/Makefile.in
index e8e183e7f0b6b2e6d8967431f9d0dd47a339b951..f90f432e3471f86ad54c8c58aa30d1273f85d183 100755 (executable)
--- a/src/TOOLSGUI/Makefile.in
+++ b/src/TOOLSGUI/Makefile.in
@@ -57,10 +57,10 @@ LIB_MOC = ToolsGUI_CatalogGeneratorDlg.h \
 
 LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl
 
-CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
-CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome
+CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS)
+CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS)
 
-LDFLAGS += $(QT_MT_LIBS) -lsuit $(CAS_KERNEL) -L$(KERNEL_ROOT_DIR)/lib/salome -lSalomeNS -lOpUtil
+LDFLAGS += $(QT_MT_LIBS) -lsuit $(CAS_KERNEL) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil
 
 @CONCLUDE@