From 9ae3f9bf20992e168595ab08538806b7e4f80432 Mon Sep 17 00:00:00 2001 From: boulant Date: Thu, 1 Dec 2005 18:54:54 +0000 Subject: [PATCH] =?utf8?q?Version=20avec=20Traitement=20d'une=20interface?= =?utf8?q?=20swig=20(NOTIFICATION=5FSWIG).=20Le=20KERNEL=20est=20transform?= =?utf8?q?=C3=A9=20jusque=20Container=20(reste=20TestContainer=20LifeCycle?= =?utf8?q?CORBA,=20...).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- configure.ac | 2 + salome_adm/unix/config_files/check_qt.m4 | 1 + salome_adm/unix/make_common_starter.am | 7 +- src/Container/Makefile.am | 145 ++++++++++++++++++ src/Container/Makefile.in | 72 --------- src/DataTypeCatalog/Makefile.am | 117 ++++++++++++++ src/DataTypeCatalog/Makefile.in | 59 ------- .../SALOME_DataTypeCatalog_Server.cxx | 2 - src/GenericObj/Makefile.am | 30 ++++ src/GenericObj/Makefile.in | 46 ------ src/Logger/Makefile.am | 46 ++++-- src/Makefile.am | 31 ++-- src/ModuleCatalog/Makefile.am | 124 +++++++++++++++ src/ModuleCatalog/Makefile.in | 72 --------- src/NOTIFICATION_SWIG/Makefile.am | 81 ++++++++++ src/NOTIFICATION_SWIG/Makefile.in | 51 ------ .../{Makefile.in => Makefile.am} | 53 ++++--- src/Notification/Makefile.am | 71 +++++++++ src/Notification/Makefile.in | 53 ------- src/Registry/Makefile.am | 78 ++++++++++ src/Registry/Makefile.in | 60 -------- src/ResourcesManager/Makefile.am | 89 +++++++++++ src/ResourcesManager/Makefile.in | 66 -------- src/RessourcesCatalog/Makefile.am | 120 +++++++++++++++ src/RessourcesCatalog/Makefile.in | 62 -------- .../SALOME_RessourcesCatalog_Server.cxx | 2 - src/SALOMELocalTrace/Makefile.am | 4 +- src/SALOMETraceCollector/Makefile.am | 36 +++++ src/SALOMETraceCollector/Makefile.in | 52 ------- src/Utils/{Makefile.in => Makefile.am} | 44 ++++-- 30 files changed, 1012 insertions(+), 664 deletions(-) create mode 100644 src/Container/Makefile.am delete mode 100644 src/Container/Makefile.in create mode 100644 src/DataTypeCatalog/Makefile.am delete mode 100644 src/DataTypeCatalog/Makefile.in create mode 100644 src/GenericObj/Makefile.am delete mode 100644 src/GenericObj/Makefile.in create mode 100644 src/ModuleCatalog/Makefile.am delete mode 100644 src/ModuleCatalog/Makefile.in create mode 100644 src/NOTIFICATION_SWIG/Makefile.am delete mode 100644 src/NOTIFICATION_SWIG/Makefile.in rename src/NamingService/{Makefile.in => Makefile.am} (50%) create mode 100644 src/Notification/Makefile.am delete mode 100644 src/Notification/Makefile.in create mode 100644 src/Registry/Makefile.am delete mode 100644 src/Registry/Makefile.in create mode 100755 src/ResourcesManager/Makefile.am delete mode 100755 src/ResourcesManager/Makefile.in create mode 100644 src/RessourcesCatalog/Makefile.am delete mode 100644 src/RessourcesCatalog/Makefile.in create mode 100644 src/SALOMETraceCollector/Makefile.am delete mode 100644 src/SALOMETraceCollector/Makefile.in rename src/Utils/{Makefile.in => Makefile.am} (63%) diff --git a/configure.ac b/configure.ac index 953664128..7d23142f8 100644 --- a/configure.ac +++ b/configure.ac @@ -221,8 +221,10 @@ echo testing swig echo --------------------------------------------- echo +AM_PATH_PYTHON(2.3) CHECK_SWIG + echo echo --------------------------------------------- echo Configuration of the ORB diff --git a/salome_adm/unix/config_files/check_qt.m4 b/salome_adm/unix/config_files/check_qt.m4 index 3faa1e990..601bc61c1 100644 --- a/salome_adm/unix/config_files/check_qt.m4 +++ b/salome_adm/unix/config_files/check_qt.m4 @@ -160,6 +160,7 @@ AC_SUBST(UIC) AC_SUBST(QT_ROOT) AC_SUBST(QT_INCLUDES) +AC_SUBST(QT_MT_INCLUDES) AC_SUBST(QT_LIBS) AC_SUBST(QT_MT_LIBS) AC_SUBST(QT_VERS) diff --git a/salome_adm/unix/make_common_starter.am b/salome_adm/unix/make_common_starter.am index 8b3a7b6e8..b477a6a2c 100644 --- a/salome_adm/unix/make_common_starter.am +++ b/salome_adm/unix/make_common_starter.am @@ -6,5 +6,8 @@ # ============================================================ # -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib/@PACKAGE@ +salomeincludedir = $(includedir)/@PACKAGE@ +libdir = $(prefix)/lib/@PACKAGE@ +bindir = $(prefix)/bin/@PACKAGE@ +salomescriptdir = $(bindir) + diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am new file mode 100644 index 000000000..9ca014227 --- /dev/null +++ b/src/Container/Makefile.am @@ -0,0 +1,145 @@ +# SALOME Container : implementation of container and engine for Kernel +# +# 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 +# +# +# +# File : Makefile.in +# Author : Paul RASCLE, EDF +# Module : SALOME +# $Header$ + + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + SALOME_Component_i.hxx \ + SALOME_Container_i.hxx \ + SALOME_ContainerManager.hxx \ + Container_init_python.hxx + +# Scripts to be installed +salomescript_DATA =\ + SALOME_ComponentPy.py \ + SALOME_ContainerPy.py \ + SALOME_Container.py + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_ContainerManager.hh $(top_builddir)/idl/SALOME_ContainerManagerSK.cc + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + @PYTHON_INCLUDES@ \ + @MPI_INCLUDES@ \ + @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ + @QT_MT_INCLUDES@ \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../SALOMETraceCollector \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(srcdir)/../Registry \ + -I$(srcdir)/../Notification \ + -I$(srcdir)/../ResourcesManager \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../Registry/libRegistry.la \ + ../Notification/libSalomeNotification.la \ + ../ResourcesManager/libSalomeResourcesManager.la \ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + ../Basics/libSALOMEBasics.la \ + @PYTHON_LIBS@ \ + @MPI_LIBS@ \ + @CORBA_LIBS@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeContainer.la +libSalomeContainer_la_SOURCES=\ + Component_i.cxx \ + Container_i.cxx \ + SALOME_ContainerManager.cxx \ + Container_init_python.cxx \ + $(BUILT_SOURCES) + +libSalomeContainer_la_CPPFLAGS =\ + $(COMMON_CPPFLAGS) + +libSalomeContainer_la_LDFLAGS =\ + -no-undefined -version-info=0:0:0 \ + @LDEXPDYNFLAGS@ + +libSalomeContainer_la_LIBADD =\ + $(COMMON_LIBS) + + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = SALOME_Container SALOME_ContainerManagerServer +SALOME_Container_SOURCES =\ + SALOME_Container.cxx \ + SALOME_Container_SignalsHandler.cxx + +SALOME_Container_CPPFLAGS =\ + $(COMMON_CPPFLAGS) + + +SALOME_Container_LDADD =\ + libSalomeContainer.la \ + $(COMMON_LIBS) \ + ../Basics/libSALOMEBasics.la + + +SALOME_ContainerManagerServer_SOURCES =\ + SALOME_ContainerManagerServer.cxx + +SALOME_ContainerManagerServer_CPPFLAGS=\ + $(COMMON_CPPFLAGS) + +SALOME_ContainerManagerServer_LDADD =\ + libSalomeContainer.la \ + $(COMMON_LIBS) \ + ../Basics/libSALOMEBasics.la diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in deleted file mode 100644 index cd185a90d..000000000 --- a/src/Container/Makefile.in +++ /dev/null @@ -1,72 +0,0 @@ -# SALOME Container : implementation of container and engine for Kernel -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_PYSCRIPTS = SALOME_ComponentPy.py \ - SALOME_ContainerPy.py \ - SALOME_Container.py - -EXPORT_HEADERS = \ - SALOME_Component_i.hxx \ - SALOME_Container_i.hxx \ - SALOME_ContainerManager.hxx \ - Container_init_python.hxx - -# Libraries targets - -LIB = libSalomeContainer.la -LIB_SRC = Component_i.cxx \ - Container_i.cxx \ - SALOME_ContainerManager.cxx \ - Container_init_python.cxx - -LIB_SERVER_IDL = SALOME_Registry.idl SALOME_Component.idl SALOME_ContainerManager.idl SALOME_Exception.idl -LIB_CLIENT_IDL = - -# Executables targets -BIN = SALOME_Container SALOME_ContainerManagerServer -BIN_SRC = SALOME_Container_SignalsHandler.cxx -BIN_SERVER_IDL = SALOME_Component.idl SALOME_ContainerManager.idl - -CPPFLAGS+= $(PYTHON_INCLUDES) $(MPI_INCLUDE) $(OCC_INCLUDES) $(QT_MT_INCLUDES) -CXXFLAGS+=$(OCC_CXXFLAGS) - -LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSALOMELocalTrace -lSalomeResourcesManager - -LIBS += @LDEXPDYNFLAGS@ $(PYTHON_LIBS) $(MPI_LIBS) - -LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics -LIBSFORBIN= $(LIBS) -@CONCLUDE@ diff --git a/src/DataTypeCatalog/Makefile.am b/src/DataTypeCatalog/Makefile.am new file mode 100644 index 000000000..57e174bb1 --- /dev/null +++ b/src/DataTypeCatalog/Makefile.am @@ -0,0 +1,117 @@ +# SALOME DataTypeCatalog : catalog of data types +# +# 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 +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : SALOME +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + SALOME_DataTypeCatalog_impl.hxx \ + SALOME_DataTypeCatalog_Parser.hxx \ + SALOME_DataTypeCatalog_Handler.hxx + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_DataTypeCatalog.hh $(top_builddir)/idl/SALOME_DataTypeCatalogSK.cc + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + ../Basics/libSALOMEBasics.la + +# +# =============================================================== +# Libraries targets +# =============================================================== +# + +lib_LTLIBRARIES = libSalomeDataTypeCatalog.la +libSalomeDataTypeCatalog_la_SOURCES=\ + SALOME_DataTypeCatalog_Handler.cxx \ + SALOME_DataTypeCatalog_impl.cxx \ + $(BUILT_SOURCES) + +libSalomeDataTypeCatalog_la_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + @QT_MT_INCLUDES@ + +libSalomeDataTypeCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeDataTypeCatalog_la_LIBADD =\ + $(COMMON_LIBS) \ + @QT_MT_LIBS@ + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = SALOME_DataTypeCatalog_Server SALOME_DataTypeCatalog_Client + +#SALOME_DataTypeCatalog_Server +SALOME_DataTypeCatalog_Server_SOURCES = SALOME_DataTypeCatalog_Server.cxx +SALOME_DataTypeCatalog_Server_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + @QT_MT_INCLUDES@ + +SALOME_DataTypeCatalog_Server_LDADD =\ + libSalomeDataTypeCatalog.la \ + $(COMMON_LIBS) \ + @CORBA_LIBS@ + +#SALOME_DataTypeCatalog_Client +SALOME_DataTypeCatalog_Client_SOURCES = SALOME_DataTypeCatalog_Client.cxx +SALOME_DataTypeCatalog_Client_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + @QT_MT_INCLUDES@ + +SALOME_DataTypeCatalog_Client_LDADD =\ + libSalomeDataTypeCatalog.la \ + $(COMMON_LIBS) \ + @CORBA_LIBS@ diff --git a/src/DataTypeCatalog/Makefile.in b/src/DataTypeCatalog/Makefile.in deleted file mode 100644 index d0ed574a6..000000000 --- a/src/DataTypeCatalog/Makefile.in +++ /dev/null @@ -1,59 +0,0 @@ -# SALOME DataTypeCatalog : catalog of data types -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = \ - SALOME_DataTypeCatalog_impl.hxx \ - SALOME_DataTypeCatalog_Parser.hxx \ - SALOME_DataTypeCatalog_Handler.hxx - -# Libraries targets -LIB = libSalomeDataTypeCatalog.la -LIB_SRC = \ - SALOME_DataTypeCatalog_Handler.cxx \ - SALOME_DataTypeCatalog_impl.cxx - -# Executables targets -# trouble we have client and serveur and build don't known about this with rule -# in fact client is a test ! So it may go away BIN ! -BIN = SALOME_DataTypeCatalog_Server SALOME_DataTypeCatalog_Client -BIN_SRC = -BIN_SERVER_IDL = SALOME_DataTypeCatalog.idl SALOME_Exception.idl - -CPPFLAGS+= $(QT_MT_INCLUDES) -CXXFLAGS+= -LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace -LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -@CONCLUDE@ diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx index 72712de82..a78e0f80e 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Server.cxx @@ -30,7 +30,6 @@ #include "SALOME_NamingService.hxx" #include "SALOME_DataTypeCatalog_impl.hxx" #include "utilities.h" -#include "SALOMETraceCollector.hxx" #include "Utils_SINGLETON.hxx" using namespace std; @@ -38,7 +37,6 @@ int main(int argc,char **argv) { // initialize the ORB CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv); - // LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); try { CosNaming::NamingContext_var _rootContext, catalogContext; diff --git a/src/GenericObj/Makefile.am b/src/GenericObj/Makefile.am new file mode 100644 index 000000000..aa151b4cd --- /dev/null +++ b/src/GenericObj/Makefile.am @@ -0,0 +1,30 @@ +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS =\ + SALOME_GenericObj_i.hh + +# The BUILT_SOURCES defines the list of files generated from the idl +# interface (SALOME_GenericObj.idl in this case). +BUILT_SOURCES = $(top_builddir)/idl/SALOME_GenericObj.hh $(top_builddir)/idl/SALOME_GenericObjSK.cc + +# Libraries targets +lib_LTLIBRARIES = libSalomeGenericObj.la +libSalomeGenericObj_la_SOURCES =\ + SALOME_GenericObj_i.cc \ + $(BUILT_SOURCES) + +libSalomeGenericObj_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeGenericObj_la_CPPFLAGS = \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ diff --git a/src/GenericObj/Makefile.in b/src/GenericObj/Makefile.in deleted file mode 100644 index 5839dfaee..000000000 --- a/src/GenericObj/Makefile.in +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D -# -# -# -# File : Makefile.in -# Author : Alexey Petrov -# Module : VISU -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets -LIB = libSalomeGenericObj.la -LIB_SRC = SALOME_GenericObj_i.cc - -LIB_SERVER_IDL = SALOME_GenericObj.idl -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -EXPORT_HEADERS = SALOME_GenericObj_i.hh - -# additionnal information to compil and link file -CPPFLAGS += - -LDFLAGS += - -LIBS += - -# additional file to be cleaned -MOSTLYCLEAN += -CLEAN += -DISTCLEAN += - -@CONCLUDE@ \ No newline at end of file diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am index 322fef611..0371578ff 100644 --- a/src/Logger/Makefile.am +++ b/src/Logger/Makefile.am @@ -13,34 +13,58 @@ include $(top_srcdir)/salome_adm/unix/make_common_starter.am salomeinclude_HEADERS = \ SALOME_Trace.hxx +# +# This makefile defines a executable target (SALOME_Logger_Server) and +# a library target (libSalomeLoggerServer.la). The executable depends +# on the library. +# + # Program files bin_PROGRAMS = SALOME_Logger_Server SALOME_Logger_Server_SOURCES = SALOME_Logger_Server_main.cxx SALOME_Logger_Server_LDADD = libSalomeLoggerServer.la +SALOME_Logger_Server_CPPFLAGS =\ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# The BUILT_SOURCES defines the list of files generated from the idl +# interface (Logger.idl in this case). +BUILT_SOURCES = $(top_builddir)/idl/Logger.hh $(top_builddir)/idl/LoggerSK.cc # Libraries targets lib_LTLIBRARIES = libSalomeLoggerServer.la libSalomeLoggerServer_la_SOURCES =\ SALOME_Trace.cxx \ SALOME_Logger_Server.cxx \ - Logger.hh LoggerSK.cc -libSalomeLoggerServer_la_LDFLAGS = -no-undefined -version-info=0:0:0 + $(BUILT_SOURCES) + +libSalomeLoggerServer_la_CPPFLAGS =\ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ +libSalomeLoggerServer_la_LDFLAGS = -no-undefined -version-info=0:0:0 + +libSalomeLoggerServer_la_LIBADD = @CORBA_LIBS@ + +# Scripts target +salomescript_DATA = SALOME_Trace.py -BUILT_SOURCES = Logger.hh LoggerSK.cc +# _CS_gbo For a better management of dependencies, we should define a +# building target linking the generated files to idl source files in +# this directory (for a future version) # These variables defines the building process of CORBA files -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/salome/idl +#OMNIORB_IDL = @OMNIORB_IDL@ +#OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +#OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl +#IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/salome/idl -Logger.hh LoggerSK.cc: $(top_srcdir)/idl/Logger.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< +#Logger.hh LoggerSK.cc: $(top_srcdir)/idl/Logger.idl +# $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< #LIB_SERVER_IDL = Logger.idl -#salomedatadir = -#salomedata_DATA = SALOME_Trace.py # Executables targets #bin_SCRIPTS = SALOME_Trace.py diff --git a/src/Makefile.am b/src/Makefile.am index 16c79ac9b..f570c8766 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,24 +28,23 @@ SUBDIRS = \ Basics \ SALOMELocalTrace \ CASCatch \ - HDFPersist + HDFPersist \ + Logger \ + SALOMETraceCollector \ + Utils \ + NamingService \ + GenericObj \ + Registry \ + ModuleCatalog \ + DataTypeCatalog \ + RessourcesCatalog \ + ResourcesManager \ + Notification \ + NOTIFICATION_SWIG \ + Container -# EN COURS Logger +# TestContainer -# -# SALOMETraceCollector \ -# Utils \ -# NamingService \ -# GenericObj \ -# Registry \ -# ModuleCatalog \ -# DataTypeCatalog \ -# RessourcesCatalog \ -# ResourcesManager \ -# Notification \ -# NOTIFICATION_SWIG \ -# Container \ -# TestContainer \ # LifeCycleCORBA \ # LifeCycleCORBA_SWIG \ # SALOMEDSClient \ diff --git a/src/ModuleCatalog/Makefile.am b/src/ModuleCatalog/Makefile.am new file mode 100644 index 000000000..cf7900b14 --- /dev/null +++ b/src/ModuleCatalog/Makefile.am @@ -0,0 +1,124 @@ +# SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules +# +# 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 +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : SALOME +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header an scripts to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + SALOME_ModuleCatalog_impl.hxx \ + SALOME_ModuleCatalog_Acomponent_impl.hxx \ + PathPrefix.hxx \ + SALOME_ModuleCatalog_Parser.hxx \ + SALOME_ModuleCatalog_Parser_IO.hxx \ + SALOME_ModuleCatalog_Handler.hxx + +# Scripts to be installed +salomescript_DATA = SALOME_TestModuleCatalog.py + + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeCatalog.la + +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_ModuleCatalog.hh $(top_builddir)/idl/SALOME_ModuleCatalogSK.cc \ + $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ + @QT_MT_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + ../Basics/libSALOMEBasics.la + +libSalomeCatalog_la_SOURCES =\ + SALOME_ModuleCatalog_Handler.cxx \ + SALOME_ModuleCatalog_Parser_IO.cxx \ + SALOME_ModuleCatalog_impl.cxx \ + SALOME_ModuleCatalog_Acomponent_impl.cxx \ + $(BUILT_SOURCES) + +libSalomeCatalog_la_CPPFLAGS =\ + -ftemplate-depth-32 \ + $(COMMON_CPPFLAGS) + +libSalomeCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0 + +libSalomeCatalog_la_LIBADD =\ + $(COMMON_LIBS) \ + @QT_MT_LIBS@ + + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = SALOME_ModuleCatalog_Server SALOME_ModuleCatalog_Client + +# SALOME_ModuleCatalog_Server +SALOME_ModuleCatalog_Server_SOURCES = SALOME_ModuleCatalog_Server.cxx +SALOME_ModuleCatalog_Server_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + -I$(srcdir)/../SALOMETraceCollector + +SALOME_ModuleCatalog_Server_LDADD =\ + libSalomeCatalog.la \ + $(COMMON_LIBS) \ + @CORBA_LIBS@ + +# SALOME_ModuleCatalog_Client +SALOME_ModuleCatalog_Client_SOURCES = SALOME_ModuleCatalog_Client.cxx +SALOME_ModuleCatalog_Client_CPPFLAGS =\ + $(COMMON_CPPFLAGS) + +SALOME_ModuleCatalog_Client_LDADD =\ + libSalomeCatalog.la \ + $(COMMON_LIBS) \ + @CORBA_LIBS@ diff --git a/src/ModuleCatalog/Makefile.in b/src/ModuleCatalog/Makefile.in deleted file mode 100644 index 65f688f97..000000000 --- a/src/ModuleCatalog/Makefile.in +++ /dev/null @@ -1,72 +0,0 @@ -# SALOME ModuleCatalog : implementation of ModuleCatalog server which parsers xml description of modules -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_PYSCRIPTS = SALOME_TestModuleCatalog.py -EXPORT_HEADERS = \ - SALOME_ModuleCatalog_impl.hxx \ - SALOME_ModuleCatalog_Acomponent_impl.hxx \ - PathPrefix.hxx \ - SALOME_ModuleCatalog_Parser.hxx \ - SALOME_ModuleCatalog_Parser_IO.hxx \ - SALOME_ModuleCatalog_Handler.hxx - -# Libraries targets -LIB = libSalomeCatalog.la -LIB_SRC = \ - SALOME_ModuleCatalog_Handler.cxx \ - SALOME_ModuleCatalog_Parser_IO.cxx \ - SALOME_ModuleCatalog_impl.cxx \ - SALOME_ModuleCatalog_Acomponent_impl.cxx - -LIB_SERVER_IDL = SALOME_ModuleCatalog.idl SALOME_Exception.idl - -CXXFLAGS+=-ftemplate-depth-32 - -# Executables targets -# trouble we have client and serveur and build don't known about this with rule -# in fact client is a test ! So it may go away BIN ! - -BIN = SALOME_ModuleCatalog_Server SALOME_ModuleCatalog_Client -BIN_SRC = -BIN_SERVER_IDL = SALOME_ModuleCatalog.idl SALOME_Exception.idl - -CPPFLAGS+= $(QT_MT_INCLUDES) -LDFLAGS+= $(QT_MT_LIBS) -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics - -LDFLAGSFORBIN+= -lSalomeNS -lSALOMELocalTrace -lOpUtil -lSALOMEBasics - - -@CONCLUDE@ diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am new file mode 100644 index 000000000..4c7359130 --- /dev/null +++ b/src/NOTIFICATION_SWIG/Makefile.am @@ -0,0 +1,81 @@ +# SALOME NOTIFICATION_SWIG : wrapping of Notification sevices in order to be available in Python +# +# 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 +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ + +# Libraries targets + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Libraries targets +# =============================================================== +# + +lib_LTLIBRARIES = libNOTIFICATIONcmodule.la +libNOTIFICATIONcmodule_la_SOURCES = NOTIFICATION_Swig.cxx +libNOTIFICATIONcmodule_la_CPPFLAGS =\ + @PYTHON_INCLUDES@ -DHAVE_CONFIG_H \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../Notification \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +libNOTIFICATIONcmodule_la_LIBADD =\ + @PYTHON_LIBS@ \ + ../Notification/libSalomeNotification.la + + +# +# =============================================================== +# Swig targets +# =============================================================== +# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) +# +BUILT_SOURCES = swig_wrap.cpp + +SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../Notification +SWIG_SOURCES = NOTIFICATION.i + +pkgpython_PYTHON = libNOTIFICATION.py +pkgpyexec_LTLIBRARIES = _libNOTIFICATION.la +_libNOTIFICATION_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) +_libNOTIFICATION_la_CPPFLAGS =\ + @PYTHON_INCLUDES@ \ + -I$(srcdir) -I$(srcdir)/../Notification \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + + +_libNOTIFICATION_la_LDFLAGS = -module +_libNOTIFICATION_la_LIBADD = libNOTIFICATIONcmodule.la + +swig_wrap.cpp : $(SWIG_SOURCES) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +CLEANFILES = swig_wrap.cpp diff --git a/src/NOTIFICATION_SWIG/Makefile.in b/src/NOTIFICATION_SWIG/Makefile.in deleted file mode 100644 index c6d707116..000000000 --- a/src/NOTIFICATION_SWIG/Makefile.in +++ /dev/null @@ -1,51 +0,0 @@ -# SALOME NOTIFICATION_SWIG : wrapping of Notification sevices in order to be available in Python -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -# Libraries targets - -EXPORT_HEADERS = - -LIB = libNOTIFICATIONcmodule.la -LIB_SRC = NOTIFICATION_Swig.cxx - -SWIG_DEF = NOTIFICATION.i -EXPORT_PYSCRIPTS = libNOTIFICATION.py -SWIG_FLAGS += -I$(srcdir) - -CPPFLAGS+=$(PYTHON_INCLUDES) -DHAVE_CONFIG_H -LIBS+= $(PYTHON_LIBS) -LDFLAGS+= -lSalomeNotification - -@CONCLUDE@ diff --git a/src/NamingService/Makefile.in b/src/NamingService/Makefile.am similarity index 50% rename from src/NamingService/Makefile.in rename to src/NamingService/Makefile.am index 13281780c..ca4cb8859 100644 --- a/src/NamingService/Makefile.in +++ b/src/NamingService/Makefile.am @@ -21,35 +21,50 @@ # # # -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/salome_adm/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_PYSCRIPTS = SALOME_NamingServicePy.py - -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS =\ SALOME_NamingService.hxx \ ServiceUnreachable.hxx \ NamingService_WaitForServerReadiness.hxx -# Libraries targets +# Scripts to be exported +salomescript_DATA =\ + SALOME_NamingServicePy.py + -LIB = libSalomeNS.la -LIB_SRC = \ +# The BUILT_SOURCES defines the list of files generated from the idl +# interface (SALOME_Exception.idl in this case). +BUILT_SOURCES = $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + + +# Libraries targets +lib_LTLIBRARIES = libSalomeNS.la +libSalomeNS_la_SOURCES =\ SALOME_NamingService.cxx \ ServiceUnreachable.cxx \ NamingService_WaitForServerReadiness.cxx -LIB_SERVER_IDL = SALOME_Exception.idl + $(BUILT_SOURCES) +# _CS_gbo We don't need to add the BUILT_SOURCES files because the +# symbols needed from this sources are given by the linked libraries +# (libOptUtil.la). Meanwhile, the symbols could be duplicated here and +# no error would occur. An other reason to add it is that the +# dependencies could lose the symbols needed + +libSalomeNS_la_LDFLAGS = -no-undefined -version-info=0:0:0 -LDFLAGS+= -lOpUtil +libSalomeNS_la_CPPFLAGS = \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -@CONCLUDE@ +libSalomeNS_la_LIBADD = ../Utils/libOpUtil.la diff --git a/src/Notification/Makefile.am b/src/Notification/Makefile.am new file mode 100644 index 000000000..0180d9839 --- /dev/null +++ b/src/Notification/Makefile.am @@ -0,0 +1,71 @@ +# SALOME Notification : wrapping of Notification service services +# +# 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 +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + NOTIFICATION.hxx \ + NOTIFICATION_Supplier.hxx \ + NOTIFICATION_Consumer.hxx \ + CosNotifyShorthands.h + +# +# =============================================================== +# Libraries targets +# =============================================================== +# + +lib_LTLIBRARIES = libSalomeNotification.la +libSalomeNotification_la_SOURCES =\ + NOTIFICATION.cxx \ + NOTIFICATION_Supplier.cxx \ + NOTIFICATION_Consumer.cxx + +libSalomeNotification_la_CPPFLAGS =\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../Utils \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + + +libSalomeNotification_la_LDFLAGS = -no-undefined -version-info=0:0:0 + +#libSalomeNotification_la_LIBADD =\ +# ../Utils/libOpUtil.la \ +# ../SALOMELocalTrace/libSALOMELocalTrace.la \ +# ../Basics/libSALOMEBasics.la + + +#LDFLAGS+= -lOpUtil -lSALOMELocalTrace +#OMNIORB_IDLCXXFLAGS+= -Wbtp diff --git a/src/Notification/Makefile.in b/src/Notification/Makefile.in deleted file mode 100644 index 4d43c67a5..000000000 --- a/src/Notification/Makefile.in +++ /dev/null @@ -1,53 +0,0 @@ -# SALOME Notification : wrapping of Notification service services -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = NOTIFICATION.hxx \ - NOTIFICATION_Supplier.hxx \ - NOTIFICATION_Consumer.hxx \ - CosNotifyShorthands.h - -# Libraries targets - -LIB = libSalomeNotification.la - -LIB_SRC = NOTIFICATION.cxx \ - NOTIFICATION_Supplier.cxx \ - NOTIFICATION_Consumer.cxx - -LDFLAGS+= -lOpUtil -lSALOMELocalTrace -OMNIORB_IDLCXXFLAGS+= -Wbtp - -@CONCLUDE@ diff --git a/src/Registry/Makefile.am b/src/Registry/Makefile.am new file mode 100644 index 000000000..83158a3e1 --- /dev/null +++ b/src/Registry/Makefile.am @@ -0,0 +1,78 @@ +# SALOME Registry : Registry server implementation +# +# 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 +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : SALOME +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS =\ + RegistryConnexion.hxx \ + RegistryService.hxx + +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_Registry.hh $(top_builddir)/idl/SALOME_RegistrySK.cc \ + $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + +# Libraries targets +lib_LTLIBRARIES = libRegistry.la +libRegistry_la_SOURCES =\ + RegistryConnexion.cxx \ + RegistryService.cxx \ + $(BUILT_SOURCES) + +libRegistry_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libRegistry_la_CPPFLAGS =\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +libRegistry_la_LIBADD =\ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la + + +# Executables targets +bin_PROGRAMS = SALOME_Registry_Server +SALOME_Registry_Server_SOURCES = SALOME_Registry_Server.cxx +SALOME_Registry_Server_LDADD =\ + libRegistry.la \ + ../Basics/libSALOMEBasics.la \ + @CORBA_LIBS@ +SALOME_Registry_Server_CPPFLAGS =\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ + -I$(srcdir)/../SALOMETraceCollector diff --git a/src/Registry/Makefile.in b/src/Registry/Makefile.in deleted file mode 100644 index 73b61f60d..000000000 --- a/src/Registry/Makefile.in +++ /dev/null @@ -1,60 +0,0 @@ -# SALOME Registry : Registry server implementation -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_PYSCRIPTS = - -EXPORT_HEADERS = \ - RegistryConnexion.hxx \ - RegistryService.hxx - -# Libraries targets - -LIB = libRegistry.la -LIB_SRC = \ - RegistryConnexion.cxx \ - RegistryService.cxx -LIB_CLIENT_IDL = SALOME_Registry.idl SALOME_Exception.idl - -# Executables targets -BIN = SALOME_Registry_Server -BIN_SRC = -BIN_SERVER_IDL = SALOME_Registry.idl - -LDFLAGS+= -lSalomeNS -lOpUtil -lSALOMELocalTrace - -LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics - -@CONCLUDE@ diff --git a/src/ResourcesManager/Makefile.am b/src/ResourcesManager/Makefile.am new file mode 100755 index 000000000..c163ef141 --- /dev/null +++ b/src/ResourcesManager/Makefile.am @@ -0,0 +1,89 @@ +# SALOME ResourcesManager +# +# 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 +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : SALOME +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + SALOME_ResourcesCatalog_Parser.hxx \ + SALOME_ResourcesManager.hxx \ + SALOME_ResourcesCatalog_Handler.hxx \ + SALOME_LoadRateManager.hxx + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_ContainerManager.hh $(top_builddir)/idl/SALOME_ContainerManagerSK.cc + + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeResourcesManager.la +libSalomeResourcesManager_la_SOURCES =\ + SALOME_ResourcesCatalog_Parser.cxx \ + SALOME_ResourcesCatalog_Handler.cxx \ + SALOME_LoadRateManager.cxx \ + SALOME_ResourcesManager.cxx \ + $(BUILT_SOURCES) + +libSalomeResourcesManager_la_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + @QT_MT_INCLUDES@ + +libSalomeResourcesManager_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeResourcesManager_la_LIBADD =\ + $(COMMON_LIBS) \ + @QT_MT_LIBS@ diff --git a/src/ResourcesManager/Makefile.in b/src/ResourcesManager/Makefile.in deleted file mode 100755 index e3aca30fa..000000000 --- a/src/ResourcesManager/Makefile.in +++ /dev/null @@ -1,66 +0,0 @@ -# SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = \ - SALOME_ResourcesCatalog_Parser.hxx \ - SALOME_ResourcesManager.hxx \ - SALOME_ResourcesCatalog_Handler.hxx \ - SALOME_LoadRateManager.hxx \ - -# Libraries targets -LIB = libSalomeResourcesManager.la -LIB_SRC = \ - SALOME_ResourcesCatalog_Parser.cxx \ - SALOME_ResourcesCatalog_Handler.cxx \ - SALOME_LoadRateManager.cxx \ - SALOME_ResourcesManager.cxx \ - -# Executables targets -# trouble we have client and serveur and build don't known about this with rule -# in fact client is a test ! So it may go away BIN ! -#BIN = test_rc2 -#SALOME_RessourcesCatalog_Server SALOME_RessourcesCatalog_Client test -LIB_CLIENT_IDL = SALOME_ContainerManager.idl SALOME_Component.idl SALOME_Exception.idl -BIN_SRC = -BIN_SERVER_IDL = SALOME_ContainerManager.idl - -CPPFLAGS+= $(QT_MT_INCLUDES) -I$(srcdir)/../Container -CXXFLAGS+= -LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace - -@CONCLUDE@ - - diff --git a/src/RessourcesCatalog/Makefile.am b/src/RessourcesCatalog/Makefile.am new file mode 100644 index 000000000..948e27e35 --- /dev/null +++ b/src/RessourcesCatalog/Makefile.am @@ -0,0 +1,120 @@ +# SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) +# +# 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 +# +# +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : SALOME +# $Header$ + + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + SALOME_RessourcesCatalog_impl.hxx \ + SALOME_RessourcesCatalog_Parser.hxx \ + SALOME_RessourcesCatalog_Handler.hxx + + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_RessourcesCatalog.hh $(top_builddir)/idl/SALOME_RessourcesCatalogSK.cc + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + ../Basics/libSALOMEBasics.la + +# +# =============================================================== +# Libraries targets +# =============================================================== +# + +lib_LTLIBRARIES = libSalomeRessourcesCatalog.la +libSalomeRessourcesCatalog_la_SOURCES=\ + SALOME_RessourcesCatalog_Handler.cxx \ + SALOME_RessourcesCatalog_impl.cxx \ + $(BUILT_SOURCES) + +libSalomeRessourcesCatalog_la_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + @QT_MT_INCLUDES@ + +libSalomeRessourcesCatalog_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeRessourcesCatalog_la_LIBADD =\ + $(COMMON_LIBS) \ + @QT_MT_LIBS@ + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = SALOME_RessourcesCatalog_Server SALOME_RessourcesCatalog_Client + +#SALOME_RessourcesCatalog_Server +SALOME_RessourcesCatalog_Server_SOURCES = SALOME_RessourcesCatalog_Server.cxx +SALOME_RessourcesCatalog_Server_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + @QT_MT_INCLUDES@ + +SALOME_RessourcesCatalog_Server_LDADD =\ + libSalomeRessourcesCatalog.la \ + $(COMMON_LIBS) \ + @CORBA_LIBS@ + +#SALOME_RessourcesCatalog_Client +SALOME_RessourcesCatalog_Client_SOURCES = SALOME_RessourcesCatalog_Client.cxx +SALOME_RessourcesCatalog_Client_CPPFLAGS =\ + $(COMMON_CPPFLAGS) \ + @QT_MT_INCLUDES@ + +SALOME_RessourcesCatalog_Client_LDADD =\ + libSalomeRessourcesCatalog.la \ + $(COMMON_LIBS) \ + @CORBA_LIBS@ + diff --git a/src/RessourcesCatalog/Makefile.in b/src/RessourcesCatalog/Makefile.in deleted file mode 100644 index 8d416a855..000000000 --- a/src/RessourcesCatalog/Makefile.in +++ /dev/null @@ -1,62 +0,0 @@ -# SALOME RessourcesCatalog : implementation of catalog resources parsing (SALOME_ModuleCatalog.idl) -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = \ - SALOME_RessourcesCatalog_impl.hxx \ - SALOME_RessourcesCatalog_Parser.hxx \ - SALOME_RessourcesCatalog_Handler.hxx - -# Libraries targets -LIB = libSalomeRessourcesCatalog.la -LIB_SRC = \ - SALOME_RessourcesCatalog_Handler.cxx \ - SALOME_RessourcesCatalog_impl.cxx - -# Executables targets -# trouble we have client and serveur and build don't known about this with rule -# in fact client is a test ! So it may go away BIN ! -BIN = SALOME_RessourcesCatalog_Server SALOME_RessourcesCatalog_Client -BIN_SRC = -BIN_SERVER_IDL = SALOME_RessourcesCatalog.idl SALOME_Exception.idl - -CPPFLAGS+= $(QT_MT_INCLUDES) -CXXFLAGS+= -LDFLAGS+= $(QT_MT_LIBS) $(OGL_LIBS) -lSalomeNS -lOpUtil -lSALOMELocalTrace -LDFLAGSFORBIN+= -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSALOMEBasics - -@CONCLUDE@ - - diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx index ea3be6a32..8ea3a1a22 100644 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx +++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_Server.cxx @@ -30,7 +30,6 @@ #include "SALOME_NamingService.hxx" #include "SALOME_RessourcesCatalog_impl.hxx" #include "utilities.h" -#include "SALOMETraceCollector.hxx" #include "Utils_SINGLETON.hxx" using namespace std; @@ -38,7 +37,6 @@ int main(int argc,char **argv) { // initialize the ORB CORBA::ORB_ptr orb = CORBA::ORB_init (argc, argv); - // LocalTraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb); try { CosNaming::NamingContext_var _rootContext, catalogContext; diff --git a/src/SALOMELocalTrace/Makefile.am b/src/SALOMELocalTrace/Makefile.am index 019401f8b..b6c9a7e02 100644 --- a/src/SALOMELocalTrace/Makefile.am +++ b/src/SALOMELocalTrace/Makefile.am @@ -21,8 +21,8 @@ # # # -# File : Makefile.in -# Author : Paul RASCLE (EDF) +# File : Makefile.am +# Author : Guillaume BOULANT (CSSI) # Module : SALOME # $Header$ diff --git a/src/SALOMETraceCollector/Makefile.am b/src/SALOMETraceCollector/Makefile.am new file mode 100644 index 000000000..0965d4d6d --- /dev/null +++ b/src/SALOMETraceCollector/Makefile.am @@ -0,0 +1,36 @@ +# SALOMETraceCollector +# +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# File : Makefile.am +# Author : Guillaume BOULANT, CSSI +# Module : KERNEL +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + SALOMETraceCollector.hxx \ + TraceCollector_WaitForServerReadiness.hxx + +# The BUILT_SOURCES defines the list of files generated from the idl +# interface (Logger.idl in this case). +BUILT_SOURCES = $(top_builddir)/idl/Logger.hh $(top_builddir)/idl/LoggerSK.cc + +# Libraries targets +lib_LTLIBRARIES = libwith_loggerTraceCollector.la + +libwith_loggerTraceCollector_la_SOURCES =\ + SALOMETraceCollector.cxx \ + TraceCollector_WaitForServerReadiness.cxx + +libwith_loggerTraceCollector_la_CPPFLAGS =\ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +libwith_loggerTraceCollector_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libwith_loggerTraceCollector_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la diff --git a/src/SALOMETraceCollector/Makefile.in b/src/SALOMETraceCollector/Makefile.in deleted file mode 100644 index a05ab828c..000000000 --- a/src/SALOMETraceCollector/Makefile.in +++ /dev/null @@ -1,52 +0,0 @@ -# SALOMELocalTrace : log on local machine -# -# 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 -# -# -# -# File : Makefile.in -# Author : Paul RASCLE (EDF) -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= SALOMETraceCollector.hxx \ - TraceCollector_WaitForServerReadiness.hxx - -EXPORT_PYSCRIPTS = - -# Libraries targets - -LIB = libwith_loggerTraceCollector.la -LIB_SRC = SALOMETraceCollector.cxx \ - TraceCollector_WaitForServerReadiness.cxx - -LIB_CLIENT_IDL = Logger.idl -LDFLAGS+= -lSALOMELocalTrace - -@CONCLUDE@ diff --git a/src/Utils/Makefile.in b/src/Utils/Makefile.am similarity index 63% rename from src/Utils/Makefile.in rename to src/Utils/Makefile.am index c862428f3..7c8e719ad 100644 --- a/src/Utils/Makefile.in +++ b/src/Utils/Makefile.am @@ -21,21 +21,16 @@ # # # -# File : Makefile.in -# Author : Marc Tajchman (CEA) +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) # Module : SALOME # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ +include $(top_srcdir)/salome_adm/unix/make_common_starter.am # header files -EXPORT_HEADERS= \ +salomeinclude_HEADERS =\ OpUtil.hxx \ Utils_Timer.hxx \ Utils_CorbaException.hxx \ @@ -49,23 +44,38 @@ EXPORT_HEADERS= \ Utils_SignalsHandler.h \ Utils_Mutex.hxx -EXPORT_PYSCRIPTS = Utils_Identity.py SALOME_utilities.py -# Libraries targets +# Scripts to be exported +salomescript_DATA =\ + Utils_Identity.py \ + SALOME_utilities.py + +# The BUILT_SOURCES defines the list of files generated from the idl +# interface (SALOME_Exception.idl in this case). +BUILT_SOURCES = $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc -LIB = libOpUtil.la -LIB_SRC = OpUtil.cxx Utils_Timer.cxx duplicate.cxx \ +# Libraries targets +lib_LTLIBRARIES = libOpUtil.la +libOpUtil_la_SOURCES =\ + OpUtil.cxx Utils_Timer.cxx duplicate.cxx \ Utils_CommException.cxx \ Utils_SALOME_Exception.cxx \ Utils_Identity.cxx Utils_ORB_INIT.cxx \ Utils_DESTRUCTEUR_GENERIQUE.cxx \ Utils_ExceptHandlers.cxx \ Utils_SignalsHandler.cxx \ - Utils_Mutex.cxx + Utils_Mutex.cxx \ + $(BUILT_SOURCES) + +libOpUtil_la_LDFLAGS = -no-undefined -version-info=0:0:0 -LIB_SERVER_IDL = SALOME_Exception.idl +libOpUtil_la_CPPFLAGS = \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ -LDFLAGS+= -lSALOMELocalTrace +libOpUtil_la_LIBADD = ../SALOMELocalTrace/libSALOMELocalTrace.la -@CONCLUDE@ -- 2.39.2