Join modifications from branch BR_DEBUG_3_2_0b1

diff --git a/INSTALL b/INSTALL
index c79562f76d826b535c81e6c84cd635da39a9de4e..343a6db51d2567609a3271f600204f6af34566b4 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1 @@
-This is the version 3.2.0b1 of LIGHT (sample no-corba-engine) SALOME module
-Compatible with :
-       - KERNEL 3.2.0b1
-       - SALOMEGUI 3.2.0b1
+SALOME2 : LIGHT module (sample)

diff --git a/LIGHT_version.h.in b/LIGHT_version.h.in
new file mode 100644 (file)
index 0000000..281bca0
--- /dev/null
+++ b/LIGHT_version.h.in
@@ -0,0 +1,34 @@
+// Copyright (C) 2005  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+// 
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either 
+// version 2.1 of the License.
+// 
+// This library is distributed in the hope that it will be useful 
+// but WITHOUT ANY WARRANTY; without even the implied warranty of 
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public  
+// License along with this library; if not, write to the Free Software 
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/
+//
+//  File   : LIGHT_version.h
+//  Author : Vadim SANDLER
+//  Module : SALOME
+
+#if !defined(__LIGHT_VERSION_H__)
+#define __LIGHT_VERSION_H__
+
+/*
+  LIGHT_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define LIGHT_VERSION_STR "@VERSION@"
+#define LIGHT_VERSION     @XVERSION@
+
+#endif // __LIGHT_VERSION_H__

diff --git a/Makefile.in b/Makefile.in
index e7b95684f672ed550e297c28653a0c37482eed42..ec583bac4eb35e5da851631037eea708de095aa5 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -18,7 +18,7 @@
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #  Author : Julia DOROVSKIKH
 #  Date   : 01/06/2005
@@ -30,7 +30,7 @@
 top_srcdir=@top_srcdir@
 top_builddir=.
 srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin
+VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:@top_srcdir@/resources:./bin
 
 
 @COMMENCE@
@@ -47,18 +47,25 @@ RESOURCES_FILES =          \
 BIN_SCRIPT= \
        VERSION
 
-LDFLAGS= -L$(top_builddir)/lib/salome 
-LDFLAGSFORBIN= -L$(top_builddir)/lib/salome
+LDFLAGS= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome 
+LDFLAGSFORBIN= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome
+
+include_list = include/salome/SALOMEconfig.h \
+               include/salome/LIGHT_version.h
 
 # copy header files in common directory
-ifeq ($(HAVE_SSTREAM),yes)
-  include_list=include/salome/SALOMEconfig.h
-else
-  include_list=include/salome/SALOMEconfig.h include/salome/sstream
+ifneq ($(HAVE_SSTREAM),yes)
+       include_list += include/salome/sstream
 endif
 
 inc: $(include_list)
 
+bin: bin/salome/VERSION
+
+bin/salome/VERSION : bin/VERSION
+       -$(RM) $@
+       $(LN_S) ../../$< $@
+
 include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
        -$(RM) $@
        $(LN_S) ../../$< $@
@@ -76,6 +83,10 @@ include/salome/sstream: salome_adm/unix/sstream
        -$(RM) $@
        $(LN_S) ../../$< $@
 
+include/salome/LIGHT_version.h: LIGHT_version.h
+       -$(RM) $@
+       $(LN_S) ../../$< $@
+
 depend:
 
 install-end:
@@ -84,10 +95,10 @@ install-end:
 
 install-include: $(include_list)
        $(INSTALL) -d  $(includedir)
-#      @for f in X $(include_list); do                         \
-#         if test $$f != X; then                               \
-#           (cp -p $$f $(includedir) || exit 1);               \
-#         fi;                                                  \
+       @for f in X $(include_list); do                                 \
+          if test $$f != X; then                                       \
+            ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1);        \
+          fi;                                                          \
        done
 
 # install script in $(bindir) :

diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
index 06e2ec9f8523b50028370fdb354160b466a67d26..507cce43e7670c72693b2b13864abfd3b7c4a2fc 100644 (file)
--- a/adm_local/Makefile.in
+++ b/adm_local/Makefile.in
@@ -14,7 +14,7 @@
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
 # source path

diff --git a/adm_local/unix/config_files/check_LIGHT.m4 b/adm_local/unix/config_files/check_LIGHT.m4
index 69e16f2456cecffaf193b9cfc5c8025a1df712e7..fa969f5e3015dc44aa49f33ba2eaff4e0de1ca83 100755 (executable)
--- a/adm_local/unix/config_files/check_LIGHT.m4
+++ b/adm_local/unix/config_files/check_LIGHT.m4
@@ -9,6 +9,9 @@ AC_CHECKING(for Light)
 
 Light_ok=no
 
+LIGHT_LDFLAGS=""
+LIGHT_CXXFLAGS=""
+
 AC_ARG_WITH(gui,
            --with-light=DIR root directory path of LIGHT installation,
            LIGHT_DIR="$withval",LIGHT_DIR="")
@@ -43,6 +46,12 @@ if test -f ${LIGHT_DIR}/lib/salome/libLIGHT.so  ; then
     LIGHT_ROOT_DIR=${LIGHT_DIR}
   fi
   AC_SUBST(LIGHT_ROOT_DIR)
+
+  LIGHT_LDFLAGS=-L${LIGHT_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+  LIGHT_CXXFLAGS=-I${LIGHT_DIR}/include/salome
+
+  AC_SUBST(LIGHT_LDFLAGS)
+  AC_SUBST(LIGHT_CXXFLAGS)
 else
   AC_MSG_WARN("Cannot find compiled LIGHT distribution")
 fi

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 32014eb0c0d57347711c93b69a7c3f8b7d6b34f1..58b2ce892880471a55b951ca2ae034d950941cc7 100644 (file)
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -13,8 +13,8 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
 
 LIBS=@LIBS@
 LIBSFORBIN=@LIBS@
-LDFLAGS=@LDFLAGS@ -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+= @STDLIB@
 LDFLAGSFORBIN+= @STDLIB@
@@ -59,8 +59,8 @@ PYTHON_VERSION = @PYTHON_VERSION@
 # Changes from the SalomePro V1.2c
 #PYTHON_SITE = @PYTHON_SITE@
 #PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@
-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
 
@@ -202,16 +202,25 @@ INSTALL_DATA=@INSTALL_DATA@
 # create a symbolic link (or a copie ?)
 LN_S=@LN_S@
 
+KERNEL_ROOT_DIR=@KERNEL_ROOT_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
+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
@@ -278,6 +287,6 @@ check_GUI.m4
 
 $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \
                           $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%)
-       cd $(top_srcdir) ; aclocal --acdir=adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
+       cd $(top_srcdir) ; -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \
                          -I @GUI_ROOT_DIR@/adm_local/unix/config_files
 

diff --git a/bin/VERSION b/bin/VERSION
deleted file mode 100755 (executable)
index f61d093..0000000
--- a/bin/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS SAMPLE LIGHT (NO-CORBA-ENGINE) MODULE : VERSION: 3.2.0b1

diff --git a/bin/VERSION.in b/bin/VERSION.in
new file mode 100755 (executable)
index 0000000..f266292
--- /dev/null
+++ b/bin/VERSION.in
@@ -0,0 +1 @@
+THIS IS SAMPLE LIGHT (NO-CORBA-ENGINE) MODULE : VERSION: @VERSION@

diff --git a/configure.in.base b/configure.in.base
index 8a357c61cf657818b52cf81df1f39157902b466f..64095c0128690a22a930fa08d363b7f935228311 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -42,8 +42,10 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=0.0.1
+VERSION=3.2.0
+XVERSION=0x030200
 AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
 
 dnl
 dnl Initialize disable corba variable
@@ -363,7 +365,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm gui_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
+for rep in salome_adm gui_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/src/LIGHTGUI/LIGHTGUI.cxx b/src/LIGHTGUI/LIGHTGUI.cxx
index 548b8471fa6c7fb2eb48710f383717878164f8b5..9bbc9a0a1de3858350e736d6031e06fe8af155f8 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI.cxx
+++ b/src/LIGHTGUI/LIGHTGUI.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI.h b/src/LIGHTGUI/LIGHTGUI.h
index dbb39d5d0f244fe809635f6fdd3921f8c9f9aea4..0064ca9870f0bd661bef6657041ee2da6d6e74cf 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI.h
+++ b/src/LIGHTGUI/LIGHTGUI.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_DataModel.cxx b/src/LIGHTGUI/LIGHTGUI_DataModel.cxx
index 5d7befe6ae65bfdf5ea57ef730bee805b6709389..0aa9a190e4c53e82cc4763cb8dbf03431e0095f0 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataModel.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_DataModel.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_DataModel.h b/src/LIGHTGUI/LIGHTGUI_DataModel.h
index 410f1cddcae312964a3bb8dd9ec2102b990798a9..9e154b44d6cf632b7cb4e1b5359c0cb470785894 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataModel.h
+++ b/src/LIGHTGUI/LIGHTGUI_DataModel.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_DataObject.cxx b/src/LIGHTGUI/LIGHTGUI_DataObject.cxx
index 5c5f565560973d0ad8a035d7fde6cc507d6f114a..16618f847d3382fa099217f421763980a0367a77 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataObject.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_DataObject.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_DataObject.h b/src/LIGHTGUI/LIGHTGUI_DataObject.h
index 940989bb046a1c58564da175f11d399ae8273ce1..c44778db614896b278a165006db0598e470911dc 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataObject.h
+++ b/src/LIGHTGUI/LIGHTGUI_DataObject.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_DataOwner.cxx b/src/LIGHTGUI/LIGHTGUI_DataOwner.cxx
index a3df0e782029cfb57e004931bfa1340c501cbe20..35f04499b4fe55817ffacc0cdfb99abbb7eee273 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataOwner.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_DataOwner.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_DataOwner.h b/src/LIGHTGUI/LIGHTGUI_DataOwner.h
index e8b3c3b52fb62711de6060160ca745f029c075ad..d540762369bbe3105820be8fe28ca5b55be2b3ea 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_DataOwner.h
+++ b/src/LIGHTGUI/LIGHTGUI_DataOwner.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_OBSelector.cxx b/src/LIGHTGUI/LIGHTGUI_OBSelector.cxx
index e1e3e118573f79f67e58db5ae2395e121735ddad..c8f846332d72d1cb57d3a3d2d1215ad59a3b8933 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_OBSelector.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_OBSelector.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_OBSelector.h b/src/LIGHTGUI/LIGHTGUI_OBSelector.h
index 1a0687ae670a8071bf0fa2d675ce42203d10d2d7..f0b778ca3ac958e8fe8b779ece408b0585e0f1e2 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_OBSelector.h
+++ b/src/LIGHTGUI/LIGHTGUI_OBSelector.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_Selection.cxx b/src/LIGHTGUI/LIGHTGUI_Selection.cxx
index 93658248d3a3812351a6f9a143def72ff3974848..f8e63c7d0b5ed9e88238a350bf66326a77fbd154 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_Selection.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_Selection.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_Selection.h b/src/LIGHTGUI/LIGHTGUI_Selection.h
index 2ce070b0f4441ededbfa298c9c9a91169532126d..97c8c309568444faa099cbe1b5c8f82d2d8062f5 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_Selection.h
+++ b/src/LIGHTGUI/LIGHTGUI_Selection.h
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
index 0d24f1fb4d227ea60ce1f7389693be7ece83e29a..4804be56cd1a316d752f80864e963ea02904a323 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
+++ b/src/LIGHTGUI/LIGHTGUI_TextPrs.cxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Natalia DONIS
 //  Date   : 01/09/2005

diff --git a/src/LIGHTGUI/LIGHTGUI_TextPrs.hxx b/src/LIGHTGUI/LIGHTGUI_TextPrs.hxx
index 8fc43b0e2df5738dc3d7dcbf120e996607e70f56..c8dad5de5ea7acf576e6e54c7bdad2e53761991f 100644 (file)
--- a/src/LIGHTGUI/LIGHTGUI_TextPrs.hxx
+++ b/src/LIGHTGUI/LIGHTGUI_TextPrs.hxx
@@ -17,7 +17,7 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 //  Author : Julia DOROVSKIKH
 //  Date   : 01/01/2005

diff --git a/src/LIGHTGUI/LIGHT_images.po b/src/LIGHTGUI/LIGHT_images.po
index c0e5b0a9f634abdb0c1e3e4fb294798cdba461dc..10315a0dbd3dd0042d948f7a1ec2b40dc13d7b82 100644 (file)
--- a/src/LIGHTGUI/LIGHT_images.po
+++ b/src/LIGHTGUI/LIGHT_images.po
@@ -17,7 +17,7 @@
 #  License along with this library; if not, write to the Free Software 
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
 # 
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #  Author : Julia DOROVSKIKH
 #  Date   : 01/06/2005

diff --git a/src/LIGHTGUI/LIGHT_msg_en.po b/src/LIGHTGUI/LIGHT_msg_en.po
index 88ce42dc3049d3bafdd14bfef262f5fc988bfee6..2d531be7e1e369f6762f3713c388721f2d5c6622 100644 (file)
--- a/src/LIGHTGUI/LIGHT_msg_en.po
+++ b/src/LIGHTGUI/LIGHT_msg_en.po
@@ -17,7 +17,7 @@
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #  Author : Julia DOROVSKIKH
 #  Date   : 01/06/2005

diff --git a/src/LIGHTGUI/Makefile.in b/src/LIGHTGUI/Makefile.in
index fcf33f5fa91c2460f69773ef09aef6dc3ffab41e..d547711997696d95792f573e3c4c2ab3729017e7 100644 (file)
--- a/src/LIGHTGUI/Makefile.in
+++ b/src/LIGHTGUI/Makefile.in
@@ -17,7 +17,7 @@
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #  Author : Julia DOROVSKIKH
 #  Date   : 01/06/2005
@@ -57,11 +57,11 @@ LIB_MOC =                       \
 # additionnal compilation flags
 CPPFLAGS += \
        $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES)  \
-       -I${GUI_ROOT_DIR}/include/salome
+       $(GUI_CXXFLAGS)
 
 # additionnal linkage flags
 LDFLAGS += \
        -lLightApp \
-       -L${GUI_ROOT_DIR}/lib/salome
+       $(GUI_LDFLAGS)
 
 @CONCLUDE@

diff --git a/src/Makefile.in b/src/Makefile.in
index cfb50cae55bee0532a951f19943538090ea10e6a..7e21cb717de2f1bae39f3abf2dce5b035ad65b7b 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -17,7 +17,7 @@
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 #  Author : Julia DOROVSKIKH
 #  Date   : 01/06/2005
@@ -38,7 +38,7 @@ ifeq (@WITHIHM@,no)
 SUBDIRS =
 endif
 
-LDFLAGS= -L$(top_builddir)/lib/salome 
-LDFLAGSFORBIN= -L$(top_builddir)/lib/salome
+LDFLAGS += ""
+LDFLAGSFORBIN += ""
 
 @MODULE@