From c599ae6a6f28dbab7e4e7d131419eddf30e23b0a Mon Sep 17 00:00:00 2001 From: jfa Date: Thu, 1 Jun 2006 11:47:36 +0000 Subject: [PATCH] Join modifications from branch BR_DEBUG_3_2_0b1 --- COMPONENT_version.h.in | 34 +++++++++++++++++ INSTALL | 5 +-- Makefile.in | 25 ++++++++---- adm_local/Makefile.in | 2 +- adm_local/unix/make_commence.in | 24 ++++++++---- adm_local/unix/make_conclude.in | 20 +++++----- bin/VERSION | 1 - bin/VERSION.in | 1 + configure.in.base | 7 ++-- idl/AddComponent.idl | 38 +++++++++---------- idl/AdditionComponent.idl | 8 ++-- idl/Calculator.idl | 6 +-- idl/DataStreamComponent.idl | 6 +-- idl/DivComponent.idl | 8 ++-- idl/FactorialComponent.idl | 8 ++-- idl/Makefile.in | 2 +- idl/MulComponent.idl | 8 ++-- idl/SIGNALSComponent.idl | 8 ++-- idl/SubComponent.idl | 8 ++-- idl/SyrComponent.idl | 8 ++-- idl/SyrControlComponent.idl | 19 +++++++++- idl/TypesCheck.idl | 36 +++++++++--------- idl/UndefinedSymbolComponent.idl | 38 +++++++++---------- ...ENTCatalog.xml => COMPONENTCatalog.xml.in} | 26 ++++++------- .../AddComponent_CheckOfUndefined.cxx | 2 +- src/AddComponent/AddComponent_Impl.cxx | 2 +- src/AddComponent/AddComponent_Impl.hxx | 2 +- src/AddComponent/Adder_Impl.cxx | 2 +- src/AddComponent/Adder_Impl.hxx | 2 +- src/AddComponent/HandleServerSideSignals.cxx | 2 +- src/AddComponent/Makefile.in | 8 ++-- .../AdditionComponent_CheckOfUndefined.cxx | 2 +- .../AdditionComponent_Impl.cxx | 2 +- .../AdditionComponent_Impl.hxx | 2 +- src/AdditionComponent/Addition_Adder_Impl.cxx | 2 +- src/AdditionComponent/Addition_Adder_Impl.hxx | 2 +- src/AdditionComponent/Makefile.in | 8 ++-- src/CalculatorComponent/CalculatorEngine.cxx | 2 +- src/CalculatorComponent/CalculatorEngine.hxx | 2 +- src/CalculatorComponent/Makefile.in | 6 +-- .../DataStreamComponent_CheckOfUndefined.cxx | 2 +- .../DataStreamComponent_Impl.cxx | 2 +- .../DataStreamComponent_Impl.hxx | 2 +- src/DataStreamComponent/Makefile.in | 8 ++-- src/DivComponent/DivComponent.cxx | 2 +- src/DivComponent/DivComponent.hxx | 2 +- src/DivComponent/Makefile.in | 6 +-- src/FactorialComponent/FactorialComponent.py | 2 +- src/FactorialComponent/Makefile.in | 2 +- src/Makefile.in | 2 +- src/MulComponent/Makefile.in | 8 ++-- src/MulComponent/MulComponent.cxx | 2 +- src/MulComponent/MulComponent.hxx | 2 +- .../HandleServerSideSignals.cxx | 2 +- src/SIGNALSComponent/Makefile.in | 8 ++-- src/SIGNALSComponent/SIGNALSComponent.cxx | 2 +- src/SIGNALSComponent/SIGNALSComponent.hxx | 2 +- .../SIGNALSComponent_CheckOfUndefined.cxx | 2 +- .../SIGNALSComponent_Impl.cxx | 2 +- .../SIGNALSComponent_Impl.hxx | 2 +- src/SIGNALSComponent_Swig/Makefile.in | 8 ++-- .../libSIGNALSComponent_Swig.i | 2 +- src/SubComponent/Makefile.in | 8 ++-- src/SubComponent/SubComponent.cxx | 2 +- src/SubComponent/SubComponent.hxx | 2 +- src/SyrComponent/COMPONENT_shared_modules.py | 2 +- src/SyrComponent/Makefile.in | 14 +++---- .../SyrComponent_CheckOfUndefined.cxx | 2 +- src/SyrComponent/SyrComponent_Impl.cxx | 2 +- src/SyrComponent/SyrComponent_Impl.hxx | 2 +- src/SyrControlComponent/Makefile.in | 19 +++++++++- .../SyrControlComponent.py | 19 +++++++++- src/TestFunctions/DynInvoke.cxx | 2 +- src/TestFunctions/DynInvoke.hxx | 2 +- src/TestFunctions/GEOM.py | 2 +- src/TestFunctions/Makefile.in | 8 ++-- src/TestFunctions/TestFunctions.cxx | 2 +- src/TestFunctions/TestFunctions.py | 2 +- src/TestFunctions/TestFunctionsMemory.cxx | 2 +- src/TestFunctions/TestFunctionsMemory1.cxx | 2 +- src/TestFunctions/TestFunctionsMemory2.cxx | 2 +- src/TestFunctions/TestFunctionsMemory3.cxx | 2 +- src/TestFunctions/TestFunctionsMemory4.cxx | 2 +- src/TypesCheck/Makefile.in | 8 ++-- .../TypesCheck_CheckOfUndefined.cxx | 2 +- src/TypesCheck/TypesCheck_Impl.cxx | 2 +- src/TypesCheck/TypesCheck_Impl.hxx | 2 +- src/UndefinedSymbolComponent/Makefile.in | 8 ++-- .../UndefinedSymbolComponent.cxx | 2 +- .../UndefinedSymbolComponent.hxx | 2 +- 90 files changed, 332 insertions(+), 260 deletions(-) create mode 100644 COMPONENT_version.h.in delete mode 100755 bin/VERSION create mode 100755 bin/VERSION.in rename resources/{COMPONENTCatalog.xml => COMPONENTCatalog.xml.in} (99%) diff --git a/COMPONENT_version.h.in b/COMPONENT_version.h.in new file mode 100644 index 0000000..9a77137 --- /dev/null +++ b/COMPONENT_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 : COMPONENT_version.h +// Author : Vadim SANDLER +// Module : SALOME + +#if !defined(__COMPONENT_VERSION_H__) +#define __COMPONENT_VERSION_H__ + +/* + COMPONENT_VERSION is (major << 16) + (minor << 8) + patch. +*/ + +#define COMPONENT_VERSION_STR "@VERSION@" +#define COMPONENT_VERSION @XVERSION@ + +#endif // __COMPONENT_VERSION_H__ diff --git a/INSTALL b/INSTALL index 1f0e9e0..d82761c 100644 --- a/INSTALL +++ b/INSTALL @@ -1,4 +1 @@ -This is the version 3.2.0b1 of COMPONENT -Compatible with : - - KERNEL 3.2.0b1 - - SALOMEGUI 3.2.0b1 +SALOME2 : COMPONENT module (sample) diff --git a/Makefile.in b/Makefile.in index a7e9f45..9109cee 100644 --- a/Makefile.in +++ b/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 # # -* Makefile *- # @@ -27,7 +27,8 @@ top_srcdir=@top_srcdir@ top_builddir=. srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl +VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl + @COMMENCE@ @@ -38,15 +39,21 @@ RESOURCES_FILES = \ BIN_SCRIPT= VERSION -# 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 +include_list = include/salome/SALOMEconfig.h \ + include/salome/COMPONENT_version.h + +ifneq ($(HAVE_SSTREAM),yes) + include_list += include/salome/sstream endif inc: idl $(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) ../../$< $@ @@ -64,6 +71,10 @@ include/salome/sstream: salome_adm/unix/sstream -$(RM) $@ $(LN_S) ../../$< $@ +include/salome/COMPONENT_version.h: COMPONENT_version.h + -$(RM) $@ + $(LN_S) ../../$< $@ + depend: depend_idl depend_idl: diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in index 40ceced..cfbe6f4 100644 --- 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 top_srcdir=@top_srcdir@ diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index ec0f49a..9196dc4 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -11,8 +11,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@ @@ -53,8 +53,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 @@ -199,16 +199,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_CXXFLAGS=@KERNEL_CXXFLAGS@ +KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ + +MED_ROOT_DIR=@MED_ROOT_DIR@ +MED_CXXFLAGS=@MED_CXXFLAGS@ +MED_LDFLAGS=@MED_LDFLAGS@ + ## 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=$(datadir)/doc @@ -275,7 +285,7 @@ ACLOCAL_MED = check_Med2.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/%) \ $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) - cd $(top_srcdir) ; aclocal - I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ + cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ -I @GUI_ROOT_DIR@/adm_local/unix/config_files \ -I @MED_ROOT_DIR@/adm_local/unix/config_files diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in index af62081..19ac4e0 100644 --- a/adm_local/unix/make_conclude.in +++ b/adm_local/unix/make_conclude.in @@ -35,9 +35,9 @@ 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 = $(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))) ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),) LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB))) @@ -48,7 +48,7 @@ endif lib: $(LIB_BUILD) $(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, $@) @@ -59,10 +59,10 @@ $(LIB_BUILD): $(top_builddir)/lib/salome/%.la: %.la $(patsubst %.la, %.so, $@).0 || true if test "X$(LIB_SWIG)" != "X"; 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 @@ -106,7 +106,7 @@ $(DEST_PYSCRIPTS): $(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 $@ @@ -260,10 +260,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/bin/VERSION b/bin/VERSION deleted file mode 100755 index 196bfd1..0000000 --- a/bin/VERSION +++ /dev/null @@ -1 +0,0 @@ -THIS IS SALOME - COMPONENT VERSION: 3.2.0b1 diff --git a/bin/VERSION.in b/bin/VERSION.in new file mode 100755 index 0000000..a1d8ed0 --- /dev/null +++ b/bin/VERSION.in @@ -0,0 +1 @@ +THIS IS SALOME - COMPONENT VERSION: @VERSION@ diff --git a/configure.in.base b/configure.in.base index 877a8b1..d6659c9 100644 --- a/configure.in.base +++ b/configure.in.base @@ -22,8 +22,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 source and build root directories @@ -437,7 +439,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl +for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources share/salome/doc idl do # if test ! -d $rep ; then # eval mkdir $rep @@ -505,7 +507,6 @@ echo AC_OUTPUT_COMMANDS([ \ chmod +x ./bin/*; \ - chmod +x ./bin/salome/* \ ]) ## do not delete this line diff --git a/idl/AddComponent.idl b/idl/AddComponent.idl index 0732c63..6a13292 100644 --- a/idl/AddComponent.idl +++ b/idl/AddComponent.idl @@ -1,27 +1,25 @@ -// Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2005 CEA/DEN, EDF R&D +// +// 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/ or email : webmaster.salome@opencascade.com // // // // File : AddComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _ADDCOMPONENT_IDL #define _ADDCOMPONENT_IDL diff --git a/idl/AdditionComponent.idl b/idl/AdditionComponent.idl index 4b97286..86bb7e4 100644 --- a/idl/AdditionComponent.idl +++ b/idl/AdditionComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : AdditionComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _ADDITIONCOMPONENT_IDL #define _ADDITIONCOMPONENT_IDL diff --git a/idl/Calculator.idl b/idl/Calculator.idl index bd29f69..3180963 100644 --- a/idl/Calculator.idl +++ b/idl/Calculator.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : Calculator.idl // Author : Laurent DADA CEA -// $Header$ #ifndef CALCULATOR_IDL #define CALCULATOR_IDL diff --git a/idl/DataStreamComponent.idl b/idl/DataStreamComponent.idl index ebbe279..a03ca9e 100644 --- a/idl/DataStreamComponent.idl +++ b/idl/DataStreamComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : DataStreamComponent.idl // Author : Jean Rahuel -// $Header: #ifndef _DATASTREAMCOMPONENT_IDL #define _DATASTREAMCOMPONENT_IDL diff --git a/idl/DivComponent.idl b/idl/DivComponent.idl index c7a83d7..dc522c2 100644 --- a/idl/DivComponent.idl +++ b/idl/DivComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : DivComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _DIVCOMPONENT_IDL #define _DIVCOMPONENT_IDL diff --git a/idl/FactorialComponent.idl b/idl/FactorialComponent.idl index 40a5351..0b0d710 100644 --- a/idl/FactorialComponent.idl +++ b/idl/FactorialComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : FactorialComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #include "SALOME_Component.idl" diff --git a/idl/Makefile.in b/idl/Makefile.in index 4b6ccb1..4d3ce9c 100644 --- a/idl/Makefile.in +++ b/idl/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 # # # generate dependencies for idl file : diff --git a/idl/MulComponent.idl b/idl/MulComponent.idl index eda62ce..02783d4 100644 --- a/idl/MulComponent.idl +++ b/idl/MulComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : MulComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _MULCOMPONENT_IDL #define _MULCOMPONENT_IDL diff --git a/idl/SIGNALSComponent.idl b/idl/SIGNALSComponent.idl index 2bd4fac..012edfa 100755 --- a/idl/SIGNALSComponent.idl +++ b/idl/SIGNALSComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : SIGNALSComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _SIGNALSCOMPONENT_IDL #define _SIGNALSCOMPONENT_IDL diff --git a/idl/SubComponent.idl b/idl/SubComponent.idl index 6f2295e..d651d23 100644 --- a/idl/SubComponent.idl +++ b/idl/SubComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : SubComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _SUBCOMPONENT_IDL #define _SUBCOMPONENT_IDL diff --git a/idl/SyrComponent.idl b/idl/SyrComponent.idl index 725c931..621d97c 100755 --- a/idl/SyrComponent.idl +++ b/idl/SyrComponent.idl @@ -1,5 +1,4 @@ -// Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +// Copyright (C) 2005 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -15,13 +14,12 @@ // 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 // // // // File : SyrComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _SYRCOMPONENT_IDL #define _SYRCOMPONENT_IDL diff --git a/idl/SyrControlComponent.idl b/idl/SyrControlComponent.idl index cca1589..70bcdc8 100644 --- a/idl/SyrControlComponent.idl +++ b/idl/SyrControlComponent.idl @@ -1,10 +1,25 @@ -// Copyright (C) 2003 CEA/DEN, EDF R&D +// Copyright (C) 2005 CEA/DEN, EDF R&D +// +// 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/ or email : webmaster.salome@opencascade.com // // // // File : SyrControlComponent.idl // Author : Jean Rahuel -// $Header: #ifndef _SYRCONTROLCOMPONENT_IDL #define _SYRCONTROLCOMPONENT_IDL diff --git a/idl/TypesCheck.idl b/idl/TypesCheck.idl index 394b806..2e16f63 100644 --- a/idl/TypesCheck.idl +++ b/idl/TypesCheck.idl @@ -1,27 +1,25 @@ -// Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2005 CEA/DEN, EDF R&D +// +// 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/ or email : webmaster.salome@opencascade.com // // // // File : TypesCheck.idl // Author : Jean Rahuel -// $Header: #ifndef __TYPESCHECK_IDL__ #define __TYPESCHECK_IDL__ diff --git a/idl/UndefinedSymbolComponent.idl b/idl/UndefinedSymbolComponent.idl index 5a36bde..d0ad5cc 100755 --- a/idl/UndefinedSymbolComponent.idl +++ b/idl/UndefinedSymbolComponent.idl @@ -1,27 +1,25 @@ -// Copyright (C) 2003 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +// Copyright (C) 2005 CEA/DEN, EDF R&D +// +// 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/ or email : webmaster.salome@opencascade.com // // // // File : UndefinedSymbolComponent.idl -// Author : -// $Header$ +// Author : Jean Rahuel #ifndef _UNDEFINEDSYMBOLCOMPONENT_IDL #define _UNDEFINEDSYMBOLCOMPONENT_IDL diff --git a/resources/COMPONENTCatalog.xml b/resources/COMPONENTCatalog.xml.in similarity index 99% rename from resources/COMPONENTCatalog.xml rename to resources/COMPONENTCatalog.xml.in index 079f4d2..38e9309 100644 --- a/resources/COMPONENTCatalog.xml +++ b/resources/COMPONENTCatalog.xml.in @@ -16,7 +16,7 @@ AddComponent SuperVisionTest MTJ - 3.2.0b1 + @VERSION@ SuperVision test: Addition 0 1 @@ -479,7 +479,7 @@ AdditionComponent SuperVisionTest JR - 3.2.0b1 + @VERSION@ SuperVision test: Addition 0 1 @@ -942,7 +942,7 @@ SubComponent SuperVisionTest MTJ - 3.2.0b1 + @VERSION@ SuperVision test: Subtraction 0 1 @@ -990,7 +990,7 @@ MulComponent SuperVisionTest MTJ - 3.2.0b1 + @VERSION@ SuperVision test: Multiplication 0 1 @@ -1038,7 +1038,7 @@ DivComponent SuperVisionTest MTJ - 3.2.0b1 + @VERSION@ SuperVision test: Division 0 1 @@ -1085,7 +1085,7 @@ SyrComponent SuperVisionTest JR - 3.2.0b1 + @VERSION@ SuperVision test 1 1 @@ -1529,7 +1529,7 @@ FactorialComponent SuperVisionTest Malvagi, Tajchman - 3.2.0b1 + @VERSION@ SuperVision test: Factorial 0 @@ -1594,7 +1594,7 @@ SyrControlComponent SuperVisionTest JR - 3.2.0b1 + @VERSION@ SuperVision test 1 0 @@ -1824,7 +1824,7 @@ TypesCheck - 3.2.0b1 + @VERSION@ SuperVision test 1 1 @@ -2104,7 +2104,7 @@ Calculator SOLVER LD - 3.2.0b1 + @VERSION@ SuperVision test: Arithmetic operations with MED_Field 0 1 @@ -2256,7 +2256,7 @@ DataStreamFactory OTHER jr - 3.2.0b1 + @VERSION@ SuperVision test 1 @@ -2735,7 +2735,7 @@ SIGNALSComponent OTHER jr - 3.2.0b1 + @VERSION@ unknown 1 1 @@ -2796,7 +2796,7 @@ UndefinedSymbolComponent OTHER jr - 3.2.0b1 + @VERSION@ unknown 1 1 diff --git a/src/AddComponent/AddComponent_CheckOfUndefined.cxx b/src/AddComponent/AddComponent_CheckOfUndefined.cxx index c9f518b..204d996 100644 --- a/src/AddComponent/AddComponent_CheckOfUndefined.cxx +++ b/src/AddComponent/AddComponent_CheckOfUndefined.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 // // // diff --git a/src/AddComponent/AddComponent_Impl.cxx b/src/AddComponent/AddComponent_Impl.cxx index 60862dc..da20623 100644 --- a/src/AddComponent/AddComponent_Impl.cxx +++ b/src/AddComponent/AddComponent_Impl.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 // // // diff --git a/src/AddComponent/AddComponent_Impl.hxx b/src/AddComponent/AddComponent_Impl.hxx index f66667c..40669ba 100644 --- a/src/AddComponent/AddComponent_Impl.hxx +++ b/src/AddComponent/AddComponent_Impl.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 // // // diff --git a/src/AddComponent/Adder_Impl.cxx b/src/AddComponent/Adder_Impl.cxx index 0dd51c7..6cd5b3f 100644 --- a/src/AddComponent/Adder_Impl.cxx +++ b/src/AddComponent/Adder_Impl.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 // // // diff --git a/src/AddComponent/Adder_Impl.hxx b/src/AddComponent/Adder_Impl.hxx index e10917e..93d7de8 100644 --- a/src/AddComponent/Adder_Impl.hxx +++ b/src/AddComponent/Adder_Impl.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 // // // diff --git a/src/AddComponent/HandleServerSideSignals.cxx b/src/AddComponent/HandleServerSideSignals.cxx index b40f721..bc233e4 100644 --- a/src/AddComponent/HandleServerSideSignals.cxx +++ b/src/AddComponent/HandleServerSideSignals.cxx @@ -15,7 +15,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 #include diff --git a/src/AddComponent/Makefile.in b/src/AddComponent/Makefile.in index 25eca5b..4dac9a7 100755 --- a/src/AddComponent/Makefile.in +++ b/src/AddComponent/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 # # # @@ -53,11 +53,11 @@ BIN = AddComponent_CheckOfUndefined BIN_SRC = HandleServerSideSignals.cxx BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA @CONCLUDE@ diff --git a/src/AdditionComponent/AdditionComponent_CheckOfUndefined.cxx b/src/AdditionComponent/AdditionComponent_CheckOfUndefined.cxx index 5e1c27e..c08995b 100644 --- a/src/AdditionComponent/AdditionComponent_CheckOfUndefined.cxx +++ b/src/AdditionComponent/AdditionComponent_CheckOfUndefined.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 // // // diff --git a/src/AdditionComponent/AdditionComponent_Impl.cxx b/src/AdditionComponent/AdditionComponent_Impl.cxx index 6a1ef41..2e90699 100644 --- a/src/AdditionComponent/AdditionComponent_Impl.cxx +++ b/src/AdditionComponent/AdditionComponent_Impl.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 // // // diff --git a/src/AdditionComponent/AdditionComponent_Impl.hxx b/src/AdditionComponent/AdditionComponent_Impl.hxx index b6f2f11..a52662d 100644 --- a/src/AdditionComponent/AdditionComponent_Impl.hxx +++ b/src/AdditionComponent/AdditionComponent_Impl.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 // // // diff --git a/src/AdditionComponent/Addition_Adder_Impl.cxx b/src/AdditionComponent/Addition_Adder_Impl.cxx index ee6ff7a..fdca3fa 100644 --- a/src/AdditionComponent/Addition_Adder_Impl.cxx +++ b/src/AdditionComponent/Addition_Adder_Impl.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 // // // diff --git a/src/AdditionComponent/Addition_Adder_Impl.hxx b/src/AdditionComponent/Addition_Adder_Impl.hxx index 4544abf..bc4d07d 100644 --- a/src/AdditionComponent/Addition_Adder_Impl.hxx +++ b/src/AdditionComponent/Addition_Adder_Impl.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 // // // diff --git a/src/AdditionComponent/Makefile.in b/src/AdditionComponent/Makefile.in index 202a52e..7217c50 100755 --- a/src/AdditionComponent/Makefile.in +++ b/src/AdditionComponent/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 # # # @@ -54,11 +54,11 @@ BIN = AdditionComponent_CheckOfUndefined BIN_SRC = BIN_SERVER_IDL = SALOME_Exception.idl -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA @CONCLUDE@ diff --git a/src/CalculatorComponent/CalculatorEngine.cxx b/src/CalculatorComponent/CalculatorEngine.cxx index 69cb4c3..a447b89 100644 --- a/src/CalculatorComponent/CalculatorEngine.cxx +++ b/src/CalculatorComponent/CalculatorEngine.cxx @@ -15,7 +15,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 // // // diff --git a/src/CalculatorComponent/CalculatorEngine.hxx b/src/CalculatorComponent/CalculatorEngine.hxx index d522827..7297f5a 100644 --- a/src/CalculatorComponent/CalculatorEngine.hxx +++ b/src/CalculatorComponent/CalculatorEngine.hxx @@ -15,7 +15,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 // // // diff --git a/src/CalculatorComponent/Makefile.in b/src/CalculatorComponent/Makefile.in index 9f8623e..aa4d4b4 100755 --- a/src/CalculatorComponent/Makefile.in +++ b/src/CalculatorComponent/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 # # # @@ -49,8 +49,8 @@ BIN_SERVER_IDL = EXPORT_HEADERS = -CPPFLAGS+= $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(MED2_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${MED_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -L${MED_ROOT_DIR}/lib/salome -lMEDEngine -lMEDClientcmodule +CPPFLAGS+= $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(MED2_INCLUDES) $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace $(MED_LDFLAGS) -lMEDEngine -lMEDClientcmodule MED.hh MEDSK.cc: ${MED_ROOT_DIR}/idl/salome/MED.idl diff --git a/src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.cxx b/src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.cxx index 6898a68..8ed8b4b 100644 --- a/src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.cxx +++ b/src/DataStreamComponent/DataStreamComponent_CheckOfUndefined.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 // // // diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.cxx b/src/DataStreamComponent/DataStreamComponent_Impl.cxx index 5218c08..d9d461f 100644 --- a/src/DataStreamComponent/DataStreamComponent_Impl.cxx +++ b/src/DataStreamComponent/DataStreamComponent_Impl.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 // // // diff --git a/src/DataStreamComponent/DataStreamComponent_Impl.hxx b/src/DataStreamComponent/DataStreamComponent_Impl.hxx index 6b2054c..c90f7a7 100644 --- a/src/DataStreamComponent/DataStreamComponent_Impl.hxx +++ b/src/DataStreamComponent/DataStreamComponent_Impl.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 // // // diff --git a/src/DataStreamComponent/Makefile.in b/src/DataStreamComponent/Makefile.in index 8a7b15b..8c0c0e9 100644 --- a/src/DataStreamComponent/Makefile.in +++ b/src/DataStreamComponent/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 # # # @@ -51,11 +51,11 @@ BIN_SRC = BIN_SERVER_IDL = CPPFLAGS+= $(PYTHON_INCLUDES) \ - -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace + $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/DivComponent/DivComponent.cxx b/src/DivComponent/DivComponent.cxx index c963256..e76b109 100644 --- a/src/DivComponent/DivComponent.cxx +++ b/src/DivComponent/DivComponent.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 // // // diff --git a/src/DivComponent/DivComponent.hxx b/src/DivComponent/DivComponent.hxx index 4b3ba95..de93126 100644 --- a/src/DivComponent/DivComponent.hxx +++ b/src/DivComponent/DivComponent.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 // // // diff --git a/src/DivComponent/Makefile.in b/src/DivComponent/Makefile.in index 3e4f1a1..728bbf5 100755 --- a/src/DivComponent/Makefile.in +++ b/src/DivComponent/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 # # # @@ -50,8 +50,8 @@ BIN = BIN_SRC = BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification @CONCLUDE@ diff --git a/src/FactorialComponent/FactorialComponent.py b/src/FactorialComponent/FactorialComponent.py index 74ab0db..b697518 100644 --- a/src/FactorialComponent/FactorialComponent.py +++ b/src/FactorialComponent/FactorialComponent.py @@ -19,7 +19,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 # # # diff --git a/src/FactorialComponent/Makefile.in b/src/FactorialComponent/Makefile.in index e76d7dc..cdbb320 100644 --- a/src/FactorialComponent/Makefile.in +++ b/src/FactorialComponent/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 # # # diff --git a/src/Makefile.in b/src/Makefile.in index b377297..71efe8b 100755 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,7 +15,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 # # # diff --git a/src/MulComponent/Makefile.in b/src/MulComponent/Makefile.in index 29a6758..6d5c409 100755 --- a/src/MulComponent/Makefile.in +++ b/src/MulComponent/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 # # # @@ -50,10 +50,10 @@ BIN = BIN_SRC = BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/MulComponent/MulComponent.cxx b/src/MulComponent/MulComponent.cxx index 9d28e5c..5c8bf09 100644 --- a/src/MulComponent/MulComponent.cxx +++ b/src/MulComponent/MulComponent.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 // // // diff --git a/src/MulComponent/MulComponent.hxx b/src/MulComponent/MulComponent.hxx index 92506e2..884abad 100644 --- a/src/MulComponent/MulComponent.hxx +++ b/src/MulComponent/MulComponent.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 // // // diff --git a/src/SIGNALSComponent/HandleServerSideSignals.cxx b/src/SIGNALSComponent/HandleServerSideSignals.cxx index b40f721..bc233e4 100644 --- a/src/SIGNALSComponent/HandleServerSideSignals.cxx +++ b/src/SIGNALSComponent/HandleServerSideSignals.cxx @@ -15,7 +15,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 #include diff --git a/src/SIGNALSComponent/Makefile.in b/src/SIGNALSComponent/Makefile.in index dd935ea..8a2d966 100755 --- a/src/SIGNALSComponent/Makefile.in +++ b/src/SIGNALSComponent/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 # # # @@ -50,11 +50,11 @@ BIN = SIGNALSComponent_CheckOfUndefined BIN_SRC = HandleServerSideSignals.cxx BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/SIGNALSComponent/SIGNALSComponent.cxx b/src/SIGNALSComponent/SIGNALSComponent.cxx index 6427510..ca809a3 100755 --- a/src/SIGNALSComponent/SIGNALSComponent.cxx +++ b/src/SIGNALSComponent/SIGNALSComponent.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 // // // diff --git a/src/SIGNALSComponent/SIGNALSComponent.hxx b/src/SIGNALSComponent/SIGNALSComponent.hxx index da06213..967c44a 100755 --- a/src/SIGNALSComponent/SIGNALSComponent.hxx +++ b/src/SIGNALSComponent/SIGNALSComponent.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 // // // diff --git a/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx b/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx index ee239da..23b7359 100644 --- a/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.cxx +++ b/src/SIGNALSComponent/SIGNALSComponent_CheckOfUndefined.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 // // // diff --git a/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx b/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx index 5d716f7..c244b56 100755 --- a/src/SIGNALSComponent/SIGNALSComponent_Impl.cxx +++ b/src/SIGNALSComponent/SIGNALSComponent_Impl.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 // // // diff --git a/src/SIGNALSComponent/SIGNALSComponent_Impl.hxx b/src/SIGNALSComponent/SIGNALSComponent_Impl.hxx index f0edda4..f978420 100755 --- a/src/SIGNALSComponent/SIGNALSComponent_Impl.hxx +++ b/src/SIGNALSComponent/SIGNALSComponent_Impl.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 // // // diff --git a/src/SIGNALSComponent_Swig/Makefile.in b/src/SIGNALSComponent_Swig/Makefile.in index 86eb4cc..0072316 100644 --- a/src/SIGNALSComponent_Swig/Makefile.in +++ b/src/SIGNALSComponent_Swig/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 # # # @@ -51,10 +51,10 @@ BIN = BIN_SRC = BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSIGNALSComponentEngine +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSIGNALSComponentEngine -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i b/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i index e46ec57..228e62c 100644 --- a/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i +++ b/src/SIGNALSComponent_Swig/libSIGNALSComponent_Swig.i @@ -15,7 +15,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 // // // diff --git a/src/SubComponent/Makefile.in b/src/SubComponent/Makefile.in index 3f3fc38..bc6ccac 100755 --- a/src/SubComponent/Makefile.in +++ b/src/SubComponent/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 # # # @@ -50,10 +50,10 @@ BIN = BIN_SRC = BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/SubComponent/SubComponent.cxx b/src/SubComponent/SubComponent.cxx index 4a9a01d..54b58b0 100644 --- a/src/SubComponent/SubComponent.cxx +++ b/src/SubComponent/SubComponent.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 // // // diff --git a/src/SubComponent/SubComponent.hxx b/src/SubComponent/SubComponent.hxx index 97dedcb..74bc237 100644 --- a/src/SubComponent/SubComponent.hxx +++ b/src/SubComponent/SubComponent.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 // // // diff --git a/src/SyrComponent/COMPONENT_shared_modules.py b/src/SyrComponent/COMPONENT_shared_modules.py index 10b1665..08332ab 100644 --- a/src/SyrComponent/COMPONENT_shared_modules.py +++ b/src/SyrComponent/COMPONENT_shared_modules.py @@ -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 # """ diff --git a/src/SyrComponent/Makefile.in b/src/SyrComponent/Makefile.in index aa5e139..8535f1a 100755 --- a/src/SyrComponent/Makefile.in +++ b/src/SyrComponent/Makefile.in @@ -1,7 +1,6 @@ # SuperVisionTest SyrComponent : example of component performing some mathinatical operations # -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2005 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -16,15 +15,14 @@ # 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # # File : Makefile.in # Author : , CEA # Module : SuperVisionTest -# $Header$ top_srcdir=@top_srcdir@ top_builddir=../.. @@ -53,10 +51,10 @@ BIN = SyrComponent_CheckOfUndefined BIN_SRC = BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx b/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx index ba948cb..9df8d11 100755 --- a/src/SyrComponent/SyrComponent_CheckOfUndefined.cxx +++ b/src/SyrComponent/SyrComponent_CheckOfUndefined.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 // // // diff --git a/src/SyrComponent/SyrComponent_Impl.cxx b/src/SyrComponent/SyrComponent_Impl.cxx index d1a01fb..eefa47b 100755 --- a/src/SyrComponent/SyrComponent_Impl.cxx +++ b/src/SyrComponent/SyrComponent_Impl.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 // // // diff --git a/src/SyrComponent/SyrComponent_Impl.hxx b/src/SyrComponent/SyrComponent_Impl.hxx index 7e76995..be7fb2d 100755 --- a/src/SyrComponent/SyrComponent_Impl.hxx +++ b/src/SyrComponent/SyrComponent_Impl.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 // // // diff --git a/src/SyrControlComponent/Makefile.in b/src/SyrControlComponent/Makefile.in index 79b026f..b5b6f32 100644 --- a/src/SyrControlComponent/Makefile.in +++ b/src/SyrControlComponent/Makefile.in @@ -1,11 +1,26 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D +# Copyright (C) 2005 CEA/DEN, EDF R&D +# +# 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/ or email : webmaster.salome@opencascade.com # # # # File : Makefile.in # Author : Jean Rahuel # Module : SuperVisionTest -# $Header: top_srcdir=@top_srcdir@ top_builddir=../.. diff --git a/src/SyrControlComponent/SyrControlComponent.py b/src/SyrControlComponent/SyrControlComponent.py index e9b8288..a0c3b8b 100644 --- a/src/SyrControlComponent/SyrControlComponent.py +++ b/src/SyrControlComponent/SyrControlComponent.py @@ -1,13 +1,28 @@ #! /usr/bin/env python # -# Copyright (C) 2003 CEA/DEN, EDF R&D +# Copyright (C) 2005 CEA/DEN, EDF R&D +# +# 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/ or email : webmaster.salome@opencascade.com # # # # File : SyrControlComponent.py # Author : Jean Rahuel # Module : SuperVisionTest -# $Header: import os import sys diff --git a/src/TestFunctions/DynInvoke.cxx b/src/TestFunctions/DynInvoke.cxx index 975e77a..b74cc88 100644 --- a/src/TestFunctions/DynInvoke.cxx +++ b/src/TestFunctions/DynInvoke.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 // // // diff --git a/src/TestFunctions/DynInvoke.hxx b/src/TestFunctions/DynInvoke.hxx index d862377..1231a04 100644 --- a/src/TestFunctions/DynInvoke.hxx +++ b/src/TestFunctions/DynInvoke.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 // // // diff --git a/src/TestFunctions/GEOM.py b/src/TestFunctions/GEOM.py index 75796ef..2a49090 100644 --- a/src/TestFunctions/GEOM.py +++ b/src/TestFunctions/GEOM.py @@ -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 # from LifeCycleCORBA import * orb = CORBA.ORB_init([''], CORBA.ORB_ID) diff --git a/src/TestFunctions/Makefile.in b/src/TestFunctions/Makefile.in index 10559fd..c9fcf3a 100644 --- a/src/TestFunctions/Makefile.in +++ b/src/TestFunctions/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 # # # @@ -54,11 +54,11 @@ BIN_CLIENT_IDL = SALOME_Component.idl \ SALOME_ContainerManager.idl \ AddComponent.idl -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeNS -lOpUtil +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil @CONCLUDE@ diff --git a/src/TestFunctions/TestFunctions.cxx b/src/TestFunctions/TestFunctions.cxx index 06d9c44..608477f 100644 --- a/src/TestFunctions/TestFunctions.cxx +++ b/src/TestFunctions/TestFunctions.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 // // // diff --git a/src/TestFunctions/TestFunctions.py b/src/TestFunctions/TestFunctions.py index 6427ea6..978a67c 100644 --- a/src/TestFunctions/TestFunctions.py +++ b/src/TestFunctions/TestFunctions.py @@ -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 # from LifeCycleCORBA import * orb = CORBA.ORB_init([''], CORBA.ORB_ID) diff --git a/src/TestFunctions/TestFunctionsMemory.cxx b/src/TestFunctions/TestFunctionsMemory.cxx index 901f224..510fd3c 100644 --- a/src/TestFunctions/TestFunctionsMemory.cxx +++ b/src/TestFunctions/TestFunctionsMemory.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 // // // diff --git a/src/TestFunctions/TestFunctionsMemory1.cxx b/src/TestFunctions/TestFunctionsMemory1.cxx index 69db016..8346b3a 100644 --- a/src/TestFunctions/TestFunctionsMemory1.cxx +++ b/src/TestFunctions/TestFunctionsMemory1.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 // // // diff --git a/src/TestFunctions/TestFunctionsMemory2.cxx b/src/TestFunctions/TestFunctionsMemory2.cxx index b27868c..7a95f44 100644 --- a/src/TestFunctions/TestFunctionsMemory2.cxx +++ b/src/TestFunctions/TestFunctionsMemory2.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 // // // diff --git a/src/TestFunctions/TestFunctionsMemory3.cxx b/src/TestFunctions/TestFunctionsMemory3.cxx index b45db29..a15e71e 100644 --- a/src/TestFunctions/TestFunctionsMemory3.cxx +++ b/src/TestFunctions/TestFunctionsMemory3.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 // // // diff --git a/src/TestFunctions/TestFunctionsMemory4.cxx b/src/TestFunctions/TestFunctionsMemory4.cxx index dd6321b..39cf511 100644 --- a/src/TestFunctions/TestFunctionsMemory4.cxx +++ b/src/TestFunctions/TestFunctionsMemory4.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 // // // diff --git a/src/TypesCheck/Makefile.in b/src/TypesCheck/Makefile.in index a80a3f5..5fc50d6 100755 --- a/src/TypesCheck/Makefile.in +++ b/src/TypesCheck/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 # # # @@ -51,11 +51,11 @@ BIN = TypesCheck_CheckOfUndefined BIN_SRC = BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace LIBSFORBIN= $(LIBS) -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/TypesCheck/TypesCheck_CheckOfUndefined.cxx b/src/TypesCheck/TypesCheck_CheckOfUndefined.cxx index 7b3c7fc..abe29d7 100644 --- a/src/TypesCheck/TypesCheck_CheckOfUndefined.cxx +++ b/src/TypesCheck/TypesCheck_CheckOfUndefined.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 // // // diff --git a/src/TypesCheck/TypesCheck_Impl.cxx b/src/TypesCheck/TypesCheck_Impl.cxx index 0b081ab..7a72dee 100644 --- a/src/TypesCheck/TypesCheck_Impl.cxx +++ b/src/TypesCheck/TypesCheck_Impl.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 // // // diff --git a/src/TypesCheck/TypesCheck_Impl.hxx b/src/TypesCheck/TypesCheck_Impl.hxx index a12035c..73fcade 100644 --- a/src/TypesCheck/TypesCheck_Impl.hxx +++ b/src/TypesCheck/TypesCheck_Impl.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 // // // diff --git a/src/UndefinedSymbolComponent/Makefile.in b/src/UndefinedSymbolComponent/Makefile.in index ae1a1bb..a292afc 100755 --- a/src/UndefinedSymbolComponent/Makefile.in +++ b/src/UndefinedSymbolComponent/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 # # # @@ -50,10 +50,10 @@ BIN = BIN_SRC = BIN_SERVER_IDL = -CPPFLAGS+= $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification +CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -LDFLAGSFORBIN+= -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace +LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace @CONCLUDE@ diff --git a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx index 4e12656..03c1f03 100755 --- a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.cxx +++ b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.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 // // // diff --git a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx index c871364..096a2d6 100755 --- a/src/UndefinedSymbolComponent/UndefinedSymbolComponent.hxx +++ b/src/UndefinedSymbolComponent/UndefinedSymbolComponent.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 // // // -- 2.30.2