From 671f145da8bba40b8fe894ebdfb24fee688f2c12 Mon Sep 17 00:00:00 2001 From: boulant Date: Fri, 2 Dec 2005 19:59:10 +0000 Subject: [PATCH] =?utf8?q?Premi=C3=A8re=20version=20avec=20la=20totalit?= =?utf8?q?=C3=A9=20des=20packages=20sources=20en=20automake.=20Les=20r?= =?utf8?q?=C3=A9pertoires=20tests=20ne=20sont=20pas=20encore=20trait=C3=A9?= =?utf8?q?s.=20La=20compilation=20et=20installation=20sont=20men=C3=A9es?= =?utf8?q?=20=C3=A0=20termes,=20mais=20le=20produit=20n'est=20pas=20valid?= =?utf8?q?=C3=A9=20par=20la=20mise=20en=20fonctionnement=20avec=20le=20GUI?= =?utf8?q?=20et=20les=20autres=20modules=20(prochaine=20=C3=A9tape).?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build_configure | 33 ++- salome_adm/unix/make_common_starter.am | 3 + src/Communication/Makefile.am | 71 +++++++ src/Communication/Makefile.in | 34 --- src/Container/Makefile.am | 6 +- src/KERNEL_PY/{Makefile.in => Makefile.am} | 31 +-- src/LifeCycleCORBA/Makefile.am | 123 +++++++++++ src/LifeCycleCORBA/Makefile.in | 61 ------ src/LifeCycleCORBA_SWIG/Makefile.am | 110 ++++++++++ src/LifeCycleCORBA_SWIG/Makefile.in | 52 ----- src/Makefile.am | 30 ++- .../{Makefile.in => Makefile.am} | 18 +- src/NOTIFICATION_SWIG/Makefile.am | 2 - src/SALOMEDS/Makefile.am | 200 ++++++++++++++++++ src/SALOMEDS/Makefile.in | 141 ------------ .../{Makefile.in => Makefile.am} | 22 +- src/SALOMEDSImpl/{Makefile.in => Makefile.am} | 88 ++++---- src/TOOLSDS/Makefile.am | 63 ++++++ src/TOOLSDS/Makefile.in | 36 ---- src/TestContainer/Makefile.am | 104 +++++++++ src/TestContainer/Makefile.in | 52 ----- 21 files changed, 796 insertions(+), 484 deletions(-) create mode 100644 src/Communication/Makefile.am delete mode 100644 src/Communication/Makefile.in rename src/KERNEL_PY/{Makefile.in => Makefile.am} (65%) create mode 100644 src/LifeCycleCORBA/Makefile.am delete mode 100644 src/LifeCycleCORBA/Makefile.in create mode 100644 src/LifeCycleCORBA_SWIG/Makefile.am delete mode 100644 src/LifeCycleCORBA_SWIG/Makefile.in rename src/ModuleGenerator/{Makefile.in => Makefile.am} (81%) create mode 100644 src/SALOMEDS/Makefile.am delete mode 100644 src/SALOMEDS/Makefile.in rename src/SALOMEDSClient/{Makefile.in => Makefile.am} (89%) rename src/SALOMEDSImpl/{Makefile.in => Makefile.am} (52%) create mode 100644 src/TOOLSDS/Makefile.am delete mode 100644 src/TOOLSDS/Makefile.in create mode 100644 src/TestContainer/Makefile.am delete mode 100644 src/TestContainer/Makefile.in diff --git a/build_configure b/build_configure index 79a07a0f1..393cc4bc5 100755 --- a/build_configure +++ b/build_configure @@ -4,9 +4,8 @@ # the configure process. It creates configuration files (ex: # ltmain.sh) using libtoolize, the aclocal macro, the configure script # using autoconf and some scripts used in building process (ex: -# install-sh) using automake. Note that automake is not used here to -# creates the files Makefile.in from the files Makefile.am (a next -# step probably). +# install-sh) using automake. Automake is used here to creates the +# files Makefile.in from the files Makefile.am. # ==================================================================== # @@ -14,24 +13,36 @@ # This creates the aclocal.m4 file from the standard macro and the # custom macro embedded in the directory salome_adm/unix/config_files. echo "====================================================== aclocal" -aclocal -I salome_adm/unix/config_files +aclocal -I salome_adm/unix/config_files || exit 1 # This instruction creates some configuration files (ltmain.sh, # config.guess and config.sub). It only depends on the libtool # version. The files are created in the directory specified with the # AC_CONFIG_AUX_DIR() tag (see configure.ac). echo "====================================================== libtoolize" -libtoolize --force --copy --automake - -# This creates the configure script from the file configure.ac (or -# configure.in if configure.ac doesn't exist) -echo "====================================================== autoconf" -autoconf +libtoolize --force --copy --automake || exit 1 # This instruction creates some scripts used in building process # (install-sh, missing, ...). It only depends on the automake # version. The files are created in the directory specified with the -# AC_CONFIG_AUX_DIR() tag (see configure.ac). +# AC_CONFIG_AUX_DIR() tag (see configure.ac). This step also +# creates the Makefile.in files from the Makefile.am files. echo "====================================================== automake" automake --add-missing --copy --gnu +# This creates the configure script from the file configure.ac (or +# configure.in if configure.ac doesn't exist) +echo "====================================================== autoconf" +autoconf + +# +# Note that automake could be executed at last after autoconf. The +# order doesn't matter. +# +# When modifying a Makefile.am file, after a first step of +# configure+make, you just have to : +# - go to the top source directory and run automake, to rebuild the Makefile.in, +# - go to the top build directory and run config.status to rebuild the +# Makefile from the Makefile.in, +# - go to the source directory being modified, and then run make. +# diff --git a/salome_adm/unix/make_common_starter.am b/salome_adm/unix/make_common_starter.am index b477a6a2c..e856e2444 100644 --- a/salome_adm/unix/make_common_starter.am +++ b/salome_adm/unix/make_common_starter.am @@ -11,3 +11,6 @@ libdir = $(prefix)/lib/@PACKAGE@ bindir = $(prefix)/bin/@PACKAGE@ salomescriptdir = $(bindir) +# Shared modules installation directory +sharedpkgpythondir=${pkgpythondir}/shared_modules + diff --git a/src/Communication/Makefile.am b/src/Communication/Makefile.am new file mode 100644 index 000000000..3f5c436ac --- /dev/null +++ b/src/Communication/Makefile.am @@ -0,0 +1,71 @@ +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + ReceiverFactory.hxx \ + SenderFactory.hxx \ + SALOMEMultiComm.hxx \ + MultiCommException.hxx + +# Scripts to be installed + +# +# =============================================================== +# Local definitions +# =============================================================== +# +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_Comm.hh $(top_builddir)/idl/SALOME_CommSK.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)/../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 = \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la + + +# _CS_gbo The need for these flags depends on wether the swig +# interface is generated and if MPI is activated. +OPT_CPPFLAGS = @PYTHON_INCLUDES@ @MPI_INCLUDES@ +OPT_LIBS = @PYTHON_LIBS@ @MPI_LIBS@ +OPT_LDFLAGS = -Xlinker -export-dynamic + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeCommunication.la +libSalomeCommunication_la_SOURCES =\ + SALOME_Comm_i.cxx \ + SenderFactory.cxx \ + MultiCommException.cxx \ + SALOMEMultiComm.cxx \ + ReceiverFactory.cxx \ + $(BUILT_SOURCES) + +libSalomeCommunication_la_CPPFLAGS = $(COMMON_CPPFLAGS) $(OPT_CPPFLAGS) +libSalomeCommunication_la_LDFLAGS = -no-undefined -version-info=0:0:0 $(OPT_LDFLAGS) +libSalomeCommunication_la_LIBADD = $(COMMON_LIBS) $(OPT_LIBS) + +# +# =============================================================== +# Executables targets +# =============================================================== +# +# Nothing to build diff --git a/src/Communication/Makefile.in b/src/Communication/Makefile.in deleted file mode 100644 index e859ea4fb..000000000 --- a/src/Communication/Makefile.in +++ /dev/null @@ -1,34 +0,0 @@ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_PYSCRIPTS = - -EXPORT_HEADERS = \ - ReceiverFactory.hxx \ - SenderFactory.hxx \ - SALOMEMultiComm.hxx \ - MultiCommException.hxx -# Libraries targets - -LIB = libSalomeCommunication.la -LIB_SRC = SALOME_Comm_i.cxx SenderFactory.cxx MultiCommException.cxx SALOMEMultiComm.cxx ReceiverFactory.cxx -LIB_SERVER_IDL = SALOME_Comm.idl SALOME_Exception.idl - -# Executables targets -BIN = -BIN_SRC = -BIN_SERVER_IDL = - -CPPFLAGS+= $(PYTHON_INCLUDES) $(MPI_INCLUDES) - -LDFLAGS+= -lOpUtil -lSALOMELocalTrace - -LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) $(MPI_LIBS) - -@CONCLUDE@ diff --git a/src/Container/Makefile.am b/src/Container/Makefile.am index 9ca014227..daa34e1cc 100644 --- a/src/Container/Makefile.am +++ b/src/Container/Makefile.am @@ -21,9 +21,9 @@ # # # -# File : Makefile.in -# Author : Paul RASCLE, EDF -# Module : SALOME +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL # $Header$ diff --git a/src/KERNEL_PY/Makefile.in b/src/KERNEL_PY/Makefile.am similarity index 65% rename from src/KERNEL_PY/Makefile.in rename to src/KERNEL_PY/Makefile.am index 0f9b8963e..b4dff32d4 100755 --- a/src/KERNEL_PY/Makefile.in +++ b/src/KERNEL_PY/Makefile.am @@ -19,20 +19,25 @@ # # # -# File : Makefile.in -# Author : Sergey RUIN, OCC -# Module : SALOME +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/salome_adm/unix/make_common_starter.am +# Scripts to be installed (pkgpython is an automake keyword for python targets) +pkgpython_PYTHON = \ + Help.py \ + PyInterp.py \ + salome.py \ + salome_shared_modules.py \ + batchmode_salome.py \ + import_hook.py \ + salome_test.py \ + salome_kernel.py \ + salome_study.py \ + salome_iapp.py \ + salome_ComponentGUI.py -@COMMENCE@ +sharedpkgpython_PYTHON = kernel_shared_modules.py -EXPORT_PYSCRIPTS = Help.py PyInterp.py salome.py salome_shared_modules.py batchmode_salome.py import_hook.py salome_test.py salome_kernel.py salome_study.py salome_iapp.py salome_ComponentGUI.py - -EXPORT_SHAREDPYSCRIPTS=kernel_shared_modules.py - -@CONCLUDE@ diff --git a/src/LifeCycleCORBA/Makefile.am b/src/LifeCycleCORBA/Makefile.am new file mode 100644 index 000000000..e6cdddc24 --- /dev/null +++ b/src/LifeCycleCORBA/Makefile.am @@ -0,0 +1,123 @@ +# SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++ +# +# 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 +# Module : KERNEL +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + SALOME_LifeCycleCORBA.hxx + +# Scripts to be installed +salomescript_DATA =\ + Launchers.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_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ + $(top_builddir)/idl/SALOME_ContainerManager.hh $(top_builddir)/idl/SALOME_ContainerManagerSK.cc \ + $(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)/../SALOMETraceCollector \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -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 =\ + ../Container/libSalomeContainer.la \ + ../ResourcesManager/libSalomeResourcesManager.la \ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + ../Basics/libSALOMEBasics.la + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeLifeCycleCORBA.la +libSalomeLifeCycleCORBA_la_SOURCES = SALOME_LifeCycleCORBA.cxx Launchers.cxx $(BUILT_SOURCES) +libSalomeLifeCycleCORBA_la_CPPFLAGS = \ + $(COMMON_CPPFLAGS) \ + @PYTHON_INCLUDES@ \ + @QT_MT_INCLUDES@ \ + -I$(srcdir)/../Container \ + -I$(srcdir)/../Notification + +libSalomeLifeCycleCORBA_la_LIBADD = $(COMMON_LIBS) +# _CS_gbo Check whether Python lib or Qt lib is not required here. +# For better understanding, it could be better to specified +# explicitely all libraries even those that are implicitly given +# throught a library mentionned in COMMON_LIBS. + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = Test_LifeCycleCORBA +Test_LifeCycleCORBA_SOURCES = Test_LifeCycleCORBA.cxx +Test_LifeCycleCORBA_CPPFLAGS =\ + -I$(srcdir)/../Registry \ + -I$(srcdir)/../Notification \ + $(COMMON_CPPFLAGS) + +Test_LifeCycleCORBA_LDADD = \ + libSalomeLifeCycleCORBA.la \ + ../Registry/libRegistry.la \ + ../Notification/libSalomeNotification.la \ + ../Container/libSalomeContainer.la \ + $(COMMON_LIBS) \ + @CORBA_LIBS@ + +#CPPFLAGS += $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) + +#LDFLAGS += -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSalomeContainer -lSalomeResourcesManager +#LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMEBasics +#LIBS += $(PYTHON_LIBS) diff --git a/src/LifeCycleCORBA/Makefile.in b/src/LifeCycleCORBA/Makefile.in deleted file mode 100644 index d5b514cf4..000000000 --- a/src/LifeCycleCORBA/Makefile.in +++ /dev/null @@ -1,61 +0,0 @@ -# SALOME LifeCycleCORBA : implementation of containers and engines life cycle both in Python and C++ -# -# 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 - Marc Tajchman, CEA -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = SALOME_LifeCycleCORBA.hxx - -EXPORT_PYSCRIPTS = Launchers.py - -# Libraries targets - -LIB = libSalomeLifeCycleCORBA.la -LIB_SRC = SALOME_LifeCycleCORBA.cxx Launchers.cxx -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ - SALOME_ModuleCatalog.idl SALOME_ContainerManager.idl SALOME_Exception.idl - -# Executables targets -BIN = Test_LifeCycleCORBA -BIN_SRC = -BIN_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ - SALOME_ModuleCatalog.idl SALOME_ContainerManager.idl - -CPPFLAGS += $(PYTHON_INCLUDES) $(QT_MT_INCLUDES) - -LDFLAGS += -lSalomeNS -lOpUtil -lSALOMELocalTrace -lSalomeContainer -lSalomeResourcesManager -LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSALOMEBasics -LIBS += $(PYTHON_LIBS) - -@CONCLUDE@ - diff --git a/src/LifeCycleCORBA_SWIG/Makefile.am b/src/LifeCycleCORBA_SWIG/Makefile.am new file mode 100644 index 000000000..7fd00ff20 --- /dev/null +++ b/src/LifeCycleCORBA_SWIG/Makefile.am @@ -0,0 +1,110 @@ +# 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 + +# +# =============================================================== +# Libraries targets +# =============================================================== +# + +# _CS_gbo I don't understand what to build here. There's no source +# files and the library is not used. I comment while understanding. + +# LIB = libSALOME_LifeCycleCORBAcmodule.la +# LIB_SRC = + +# LIB_CLIENT_IDL = SALOME_Component.idl SALOME_ContainerManager.idl SALOME_Exception.idl + + + +# +# =============================================================== +# Swig targets +# =============================================================== +# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) +# +# Step 1: build the wrapping source files with swig +# +# libSALOME_LifeCycleCORBA.i -- swig --> swig_wrap.cpp +# libSALOME_LifeCycleCORBA.py +# +# Step 2: build the dynamic library from cpp built source files and +# dependant libraries. +# +# swig_wrap.cpp -- gcc --> swig_wrap.o |-- link --> _libSALOME_LifeCycleCORBA.la +# + | +# dependant libs | +# +# The file libSALOME_LifeCycleCORBA.py will be installed in +# /lib/python/site-package/salome. +# The library will be installed in the common place. +# + +BUILT_SOURCES = swig_wrap.cpp + +SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../LifeCycleCORBA +SWIG_SOURCES = libSALOME_LifeCycleCORBA.i + +pkgpython_PYTHON = libSALOME_LifeCycleCORBA.py +pkgpyexec_LTLIBRARIES = _libSALOME_LifeCycleCORBA.la +_libSALOME_LifeCycleCORBA_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) +_libSALOME_LifeCycleCORBA_la_CPPFLAGS =\ + @PYTHON_INCLUDES@ \ + -I$(srcdir) -I$(srcdir)/../LifeCycleCORBA \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +_libSALOME_LifeCycleCORBA_la_LDFLAGS = -module +_libSALOME_LifeCycleCORBA_la_LIBADD = \ + ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la \ + @PYTHON_LIBS@ + +swig_wrap.cpp : $(SWIG_SOURCES) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +CLEANFILES = swig_wrap.cpp + + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# Scripts to be installed. +salomescript_DATA =\ + LifeCycleCORBA.py \ + TestLifeCycleCORBA.py + +# It's not needed to specify libSALOME_LifeCycleCORBA.py. It is +# automaticaly installed through the swig target pkgpython_PYTHON. diff --git a/src/LifeCycleCORBA_SWIG/Makefile.in b/src/LifeCycleCORBA_SWIG/Makefile.in deleted file mode 100644 index 20b6d6459..000000000 --- a/src/LifeCycleCORBA_SWIG/Makefile.in +++ /dev/null @@ -1,52 +0,0 @@ -# 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 - -LIB = libSALOME_LifeCycleCORBAcmodule.la -LIB_SRC = - -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_ContainerManager.idl SALOME_Exception.idl - -SWIG_DEF = libSALOME_LifeCycleCORBA.i - -EXPORT_PYSCRIPTS = libSALOME_LifeCycleCORBA.py LifeCycleCORBA.py TestLifeCycleCORBA.py - -CPPFLAGS+= $(PYTHON_INCLUDES) - -LIBS+= $(PYTHON_LIBS) -lSalomeLifeCycleCORBA - -LDFLAGS+= -lSalomeLifeCycleCORBA - -@CONCLUDE@ diff --git a/src/Makefile.am b/src/Makefile.am index f570c8766..635527733 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,9 +19,9 @@ # # # -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Module : SALOME +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL # $Header$ SUBDIRS = \ @@ -41,17 +41,15 @@ SUBDIRS = \ ResourcesManager \ Notification \ NOTIFICATION_SWIG \ - Container - -# TestContainer - -# LifeCycleCORBA \ -# LifeCycleCORBA_SWIG \ -# SALOMEDSClient \ -# TOOLSDS \ -# SALOMEDSImpl \ -# SALOMEDS \ -# KERNEL_PY \ -# ModuleGenerator \ -# Communication + Container \ + TestContainer \ + LifeCycleCORBA \ + LifeCycleCORBA_SWIG \ + SALOMEDSClient \ + TOOLSDS \ + SALOMEDSImpl \ + SALOMEDS \ + KERNEL_PY \ + ModuleGenerator \ + Communication diff --git a/src/ModuleGenerator/Makefile.in b/src/ModuleGenerator/Makefile.am similarity index 81% rename from src/ModuleGenerator/Makefile.in rename to src/ModuleGenerator/Makefile.am index 5abeb5270..017c82625 100644 --- a/src/ModuleGenerator/Makefile.in +++ b/src/ModuleGenerator/Makefile.am @@ -19,19 +19,11 @@ # # # -# File : Makefile.in -# Author : Marc Tajchman -# 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 = IDLparser.py - -@CONCLUDE@ +salomescript_DATA = IDLparser.py diff --git a/src/NOTIFICATION_SWIG/Makefile.am b/src/NOTIFICATION_SWIG/Makefile.am index 4c7359130..3a83ebc34 100644 --- a/src/NOTIFICATION_SWIG/Makefile.am +++ b/src/NOTIFICATION_SWIG/Makefile.am @@ -26,8 +26,6 @@ # Module : KERNEL # $Header$ -# Libraries targets - include $(top_srcdir)/salome_adm/unix/make_common_starter.am # diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am new file mode 100644 index 000000000..aa23803e0 --- /dev/null +++ b/src/SALOMEDS/Makefile.am @@ -0,0 +1,200 @@ +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS= \ + SALOMEDS_StudyManager_i.hxx \ + SALOMEDS_Driver_i.hxx \ + SALOMEDS_StudyManager.hxx \ + SALOMEDS_Study_i.hxx \ + SALOMEDS_Study.hxx \ + SALOMEDS_SObject_i.hxx \ + SALOMEDS_SObject.hxx \ + SALOMEDS_SComponent_i.hxx \ + SALOMEDS_SComponent.hxx \ + SALOMEDS_GenericAttribute_i.hxx \ + SALOMEDS_GenericAttribute.hxx + +# Scripts to be installed +salomescript_DATA = SALOME_DriverPy.py + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOMEDS.hh $(top_builddir)/idl/SALOMEDSSK.cc \ + $(top_builddir)/idl/SALOMEDS_Attributes.hh $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ + $(top_builddir)/idl/SALOME_GenericObj.hh $(top_builddir)/idl/SALOME_GenericObjSK.cc \ + $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.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=\ + @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ + @BOOST_CPPFLAGS@ \ + -I$(srcdir)/../HDFPersist \ + @HDF5_INCLUDES@ \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../Utils \ + -I$(srcdir)/../SALOMEDSImpl \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../GenericObj \ + -I$(srcdir)/../SALOMEDSClient \ + -I$(srcdir)/../LifeCycleCORBA \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# This flag is used to resolve the dependencies of OCC libraries. +LDXMUFLAGS = -L/usr/X11R6/lib -lXmu + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../TOOLSDS/libTOOLSDS.la \ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + ../Basics/libSALOMEBasics.la \ + ../HDFPersist/libSalomeHDFPersist.la \ + ../SALOMEDSImpl/libSalomeDSImpl.la \ + ../GenericObj/libSalomeGenericObj.la \ + ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la \ + @CAS_LDPATH@ -lTKernel -lTKCAF -lTKBO -lTKStdSchema \ + @HDF5_LIBS@ \ + $(LDXMUFLAGS) + + +#LDFLAGS+= -lSalomeGenericObj -lSalomeLifeCycleCORBA + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeDS.la +libSalomeDS_la_SOURCES = \ + SALOMEDS.cxx \ + SALOMEDS_Driver_i.cxx \ + SALOMEDS_StudyManager_i.cxx \ + SALOMEDS_UseCaseBuilder_i.cxx \ + SALOMEDS_UseCaseIterator_i.cxx \ + SALOMEDS_ChildIterator_i.cxx \ + SALOMEDS_SComponentIterator_i.cxx \ + SALOMEDS_Study_i.cxx \ + SALOMEDS_StudyBuilder_i.cxx \ + SALOMEDS_SObject_i.cxx \ + SALOMEDS_SComponent_i.cxx \ + SALOMEDS_GenericAttribute_i.cxx \ + SALOMEDS_AttributeComment_i.cxx \ + SALOMEDS_AttributeExternalFileDef_i.cxx \ + SALOMEDS_AttributeFileType_i.cxx \ + SALOMEDS_AttributeIOR_i.cxx \ + SALOMEDS_AttributeInteger_i.cxx \ + SALOMEDS_AttributeName_i.cxx \ + SALOMEDS_AttributePersistentRef_i.cxx \ + SALOMEDS_AttributeReal_i.cxx \ + SALOMEDS_AttributeSequenceOfReal_i.cxx \ + SALOMEDS_AttributeSequenceOfInteger_i.cxx \ + SALOMEDS_AttributeDrawable_i.cxx \ + SALOMEDS_AttributeSelectable_i.cxx \ + SALOMEDS_AttributeOpened_i.cxx \ + SALOMEDS_AttributeFlags_i.cxx \ + SALOMEDS_AttributeGraphic_i.cxx \ + SALOMEDS_AttributeExpandable_i.cxx \ + SALOMEDS_AttributeTextColor_i.cxx \ + SALOMEDS_AttributeTextHighlightColor_i.cxx \ + SALOMEDS_AttributePixMap_i.cxx \ + SALOMEDS_AttributeTreeNode_i.cxx \ + SALOMEDS_AttributeLocalID_i.cxx \ + SALOMEDS_AttributeUserID_i.cxx \ + SALOMEDS_AttributeTarget_i.cxx \ + SALOMEDS_AttributeTableOfInteger_i.cxx \ + SALOMEDS_AttributeTableOfReal_i.cxx \ + SALOMEDS_AttributeTableOfString_i.cxx \ + SALOMEDS_AttributeStudyProperties_i.cxx \ + SALOMEDS_AttributePythonObject_i.cxx \ + SALOMEDS_SObject.cxx \ + SALOMEDS_SComponent.cxx \ + SALOMEDS_GenericAttribute.cxx \ + SALOMEDS_ChildIterator.cxx \ + SALOMEDS_SComponentIterator.cxx \ + SALOMEDS_UseCaseIterator.cxx \ + SALOMEDS_UseCaseBuilder.cxx \ + SALOMEDS_StudyBuilder.cxx \ + SALOMEDS_Study.cxx \ + SALOMEDS_StudyManager.cxx \ + SALOMEDS_AttributeStudyProperties.cxx \ + SALOMEDS_AttributeComment.cxx \ + SALOMEDS_AttributeDrawable.cxx \ + SALOMEDS_AttributeExpandable.cxx \ + SALOMEDS_AttributeExternalFileDef.cxx \ + SALOMEDS_AttributeFileType.cxx \ + SALOMEDS_AttributeFlags.cxx \ + SALOMEDS_AttributeGraphic.cxx \ + SALOMEDS_AttributeIOR.cxx \ + SALOMEDS_AttributeInteger.cxx \ + SALOMEDS_AttributeLocalID.cxx \ + SALOMEDS_AttributeName.cxx \ + SALOMEDS_AttributeOpened.cxx \ + SALOMEDS_AttributePythonObject.cxx \ + SALOMEDS_AttributeReal.cxx \ + SALOMEDS_AttributeSelectable.cxx \ + SALOMEDS_AttributeSequenceOfInteger.cxx \ + SALOMEDS_AttributePersistentRef.cxx \ + SALOMEDS_AttributePixMap.cxx \ + SALOMEDS_AttributeSequenceOfReal.cxx \ + SALOMEDS_AttributeTableOfInteger.cxx \ + SALOMEDS_AttributeTableOfReal.cxx \ + SALOMEDS_AttributeTableOfString.cxx \ + SALOMEDS_AttributeTarget.cxx \ + SALOMEDS_AttributeTextColor.cxx \ + SALOMEDS_AttributeTextHighlightColor.cxx \ + SALOMEDS_AttributeTreeNode.cxx \ + SALOMEDS_AttributeUserID.cxx \ + $(BUILT_SOURCES) + +libSalomeDS_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libSalomeDS_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeDS_la_LIBADD = $(COMMON_LIBS) + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = SALOMEDS_Server SALOMEDS_Client + +SALOMEDS_Server_SOURCES = SALOMEDS_Server.cxx +SALOMEDS_Server_CPPFLAGS = $(COMMON_CPPFLAGS) +SALOMEDS_Server_LDADD = \ + libSalomeDS.la $(COMMON_LIBS) \ + ../ResourcesManager/libSalomeResourcesManager.la \ + -lTKLCAF -lTKMath \ + @CORBA_LIBS@ + +SALOMEDS_Client_SOURCES = SALOMEDS_Client.cxx +SALOMEDS_Client_CPPFLAGS = $(COMMON_CPPFLAGS) +SALOMEDS_Client_LDADD = \ + libSalomeDS.la $(COMMON_LIBS) \ + ../ResourcesManager/libSalomeResourcesManager.la \ + -lTKLCAF -lTKMath \ + @CORBA_LIBS@ + + +################ +#LDFLAGSFORBIN= $(LDFLAGS) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics + diff --git a/src/SALOMEDS/Makefile.in b/src/SALOMEDS/Makefile.in deleted file mode 100644 index fc2714c18..000000000 --- a/src/SALOMEDS/Makefile.in +++ /dev/null @@ -1,141 +0,0 @@ -# -# File : Makefile.in -# Author : Sergey RUIN -# Module : SALOME - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl - - -@COMMENCE@ - -EXPORT_PYSCRIPTS = SALOME_DriverPy.py - -EXPORT_HEADERS= \ - SALOMEDS_StudyManager_i.hxx \ - SALOMEDS_Driver_i.hxx \ - SALOMEDS_StudyManager.hxx \ - SALOMEDS_Study_i.hxx \ - SALOMEDS_Study.hxx \ - SALOMEDS_SObject_i.hxx \ - SALOMEDS_SObject.hxx \ - SALOMEDS_SComponent_i.hxx \ - SALOMEDS_SComponent.hxx \ - SALOMEDS_GenericAttribute_i.hxx \ - SALOMEDS_GenericAttribute.hxx - -# Libraries targets - -LIB = libSalomeDS.la -LIB_SRC = \ - SALOMEDS.cxx \ - SALOMEDS_Driver_i.cxx \ - SALOMEDS_StudyManager_i.cxx \ - SALOMEDS_UseCaseBuilder_i.cxx \ - SALOMEDS_UseCaseIterator_i.cxx \ - SALOMEDS_ChildIterator_i.cxx \ - SALOMEDS_SComponentIterator_i.cxx \ - SALOMEDS_Study_i.cxx \ - SALOMEDS_StudyBuilder_i.cxx \ - SALOMEDS_SObject_i.cxx \ - SALOMEDS_SComponent_i.cxx \ - SALOMEDS_GenericAttribute_i.cxx \ - SALOMEDS_AttributeComment_i.cxx \ - SALOMEDS_AttributeExternalFileDef_i.cxx \ - SALOMEDS_AttributeFileType_i.cxx \ - SALOMEDS_AttributeIOR_i.cxx \ - SALOMEDS_AttributeInteger_i.cxx \ - SALOMEDS_AttributeName_i.cxx \ - SALOMEDS_AttributePersistentRef_i.cxx \ - SALOMEDS_AttributeReal_i.cxx \ - SALOMEDS_AttributeSequenceOfReal_i.cxx \ - SALOMEDS_AttributeSequenceOfInteger_i.cxx \ - SALOMEDS_AttributeDrawable_i.cxx \ - SALOMEDS_AttributeSelectable_i.cxx \ - SALOMEDS_AttributeOpened_i.cxx \ - SALOMEDS_AttributeFlags_i.cxx \ - SALOMEDS_AttributeGraphic_i.cxx \ - SALOMEDS_AttributeExpandable_i.cxx \ - SALOMEDS_AttributeTextColor_i.cxx \ - SALOMEDS_AttributeTextHighlightColor_i.cxx \ - SALOMEDS_AttributePixMap_i.cxx \ - SALOMEDS_AttributeTreeNode_i.cxx \ - SALOMEDS_AttributeLocalID_i.cxx \ - SALOMEDS_AttributeUserID_i.cxx \ - SALOMEDS_AttributeTarget_i.cxx \ - SALOMEDS_AttributeTableOfInteger_i.cxx \ - SALOMEDS_AttributeTableOfReal_i.cxx \ - SALOMEDS_AttributeTableOfString_i.cxx \ - SALOMEDS_AttributeStudyProperties_i.cxx \ - SALOMEDS_AttributePythonObject_i.cxx \ - SALOMEDS_SObject.cxx \ - SALOMEDS_SComponent.cxx \ - SALOMEDS_GenericAttribute.cxx \ - SALOMEDS_ChildIterator.cxx \ - SALOMEDS_SComponentIterator.cxx \ - SALOMEDS_UseCaseIterator.cxx \ - SALOMEDS_UseCaseBuilder.cxx \ - SALOMEDS_StudyBuilder.cxx \ - SALOMEDS_Study.cxx \ - SALOMEDS_StudyManager.cxx \ - SALOMEDS_AttributeStudyProperties.cxx \ - SALOMEDS_AttributeComment.cxx \ - SALOMEDS_AttributeDrawable.cxx \ - SALOMEDS_AttributeExpandable.cxx \ - SALOMEDS_AttributeExternalFileDef.cxx \ - SALOMEDS_AttributeFileType.cxx \ - SALOMEDS_AttributeFlags.cxx \ - SALOMEDS_AttributeGraphic.cxx \ - SALOMEDS_AttributeIOR.cxx \ - SALOMEDS_AttributeInteger.cxx \ - SALOMEDS_AttributeLocalID.cxx \ - SALOMEDS_AttributeName.cxx \ - SALOMEDS_AttributeOpened.cxx \ - SALOMEDS_AttributePythonObject.cxx \ - SALOMEDS_AttributeReal.cxx \ - SALOMEDS_AttributeSelectable.cxx \ - SALOMEDS_AttributeSequenceOfInteger.cxx \ - SALOMEDS_AttributePersistentRef.cxx \ - SALOMEDS_AttributePixMap.cxx \ - SALOMEDS_AttributeSequenceOfReal.cxx \ - SALOMEDS_AttributeTableOfInteger.cxx \ - SALOMEDS_AttributeTableOfReal.cxx \ - SALOMEDS_AttributeTableOfString.cxx \ - SALOMEDS_AttributeTarget.cxx \ - SALOMEDS_AttributeTextColor.cxx \ - SALOMEDS_AttributeTextHighlightColor.cxx \ - SALOMEDS_AttributeTreeNode.cxx \ - SALOMEDS_AttributeUserID.cxx - - -# Executables targets -BIN = SALOMEDS_Server SALOMEDS_Client -BIN_SRC = -LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOME_GenericObj.idl -BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl -BIN_CLIENT_IDL = - -CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS+= $(HDF5_LIBS) -lTOOLSDS -lSalomeNS -lSalomeHDFPersist -lOpUtil -lSALOMELocalTrace -lSalomeDSImpl -lSalomeGenericObj $(CAS_LDPATH) -lTKernel -lTKCAF -lTKBO -lTKStdSchema -lSalomeGenericObj -lSalomeLifeCycleCORBA - -# _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC. -# La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans). -# On est donc obligé ici, pour permettre l'édition de lien avec les bibliothèques OCC, de spécifier le -# chemin d'accès aux bibliothèques Xmu -# - -# _CS_gbo_090604 Ajout Sp.cifique Calibre 3, pour l'utilisation de la version 5.12 de la biblioth.que OCC. -# La biblioth.que OCC5.12 a .t. compil.e sur Calibre 3 avec l'extention Xmu (impossible de compiler sans). -# On est donc oblig. ici, pour permettre l'.dition de lien avec les biblioth.ques OCC, de sp.cifier le -# chemin d'acc.s aux biblioth.ques Xmu -# -LDXMUFLAGS= -L/usr/X11R6/lib -lXmu -LDFLAGS+=$(LDXMUFLAGS) -LDFLAGSFORBIN= $(LDFLAGS) -lTKLCAF -lTKMath -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics - -@CONCLUDE@ - - diff --git a/src/SALOMEDSClient/Makefile.in b/src/SALOMEDSClient/Makefile.am similarity index 89% rename from src/SALOMEDSClient/Makefile.in rename to src/SALOMEDSClient/Makefile.am index c3c92b5e2..a0b75a2b5 100644 --- a/src/SALOMEDSClient/Makefile.in +++ b/src/SALOMEDSClient/Makefile.am @@ -1,16 +1,13 @@ -# File : Makefile.in -# Author : Sergey RUIN -# Module : SALOME +# SALOMEDSClient: client interface of SALOMEDS +# +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl +include $(top_srcdir)/salome_adm/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS= SALOMEDSClient_definitions.hxx \ +salomeinclude_HEADERS=\ + SALOMEDSClient_definitions.hxx \ SALOMEDSClient_AttributeComment.hxx \ SALOMEDSClient_AttributeDrawable.hxx \ SALOMEDSClient_AttributeExpandable.hxx \ @@ -50,6 +47,3 @@ EXPORT_HEADERS= SALOMEDSClient_definitions.hxx \ SALOMEDSClient_UseCaseBuilder.hxx \ SALOMEDSClient_UseCaseIterator.hxx \ SALOMEDSClient.hxx - -@CONCLUDE@ - diff --git a/src/SALOMEDSImpl/Makefile.in b/src/SALOMEDSImpl/Makefile.am similarity index 52% rename from src/SALOMEDSImpl/Makefile.in rename to src/SALOMEDSImpl/Makefile.am index de9c3e58b..a82949f1e 100644 --- a/src/SALOMEDSImpl/Makefile.in +++ b/src/SALOMEDSImpl/Makefile.am @@ -1,16 +1,16 @@ -# File : Makefile.in -# Author : Sergey RUIN -# Module : SALOME +# File : Makefile.am +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl +include $(top_srcdir)/salome_adm/unix/make_common_starter.am - -@COMMENCE@ - -EXPORT_HEADERS= \ +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS= \ SALOMEDSImpl_Attributes.hxx \ SALOMEDSImpl_SObject.hxx \ SALOMEDSImpl_SComponent.hxx \ @@ -54,21 +54,39 @@ EXPORT_HEADERS= \ SALOMEDSImpl_Study.hxx \ SALOMEDSImpl_StudyManager.hxx \ SALOMEDSImpl_OCAFApplication.hxx \ - SALOMEDSImpl_ChildNodeIterator.hxx \ + SALOMEDSImpl_ChildNodeIterator.hxx -LIB_CLIENT_IDL = -LIB_SERVER_IDL = +# +# =============================================================== +# Local definitions +# =============================================================== +# -# Executables targets -BIN = testDS -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ + -I$(srcdir)/../HDFPersist \ + @HDF5_INCLUDES@ -# Libraries targets +# This flag is used to resolve the dependencies of OCC libraries. +LDXMUFLAGS = -L/usr/X11R6/lib -lXmu + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../HDFPersist/libSalomeHDFPersist.la \ + @CAS_LDPATH@ -lTKCAF -lTKBO -lTKLCAF -lTKMath -lTKStdSchema -lTKernel \ + @HDF5_LIBS@ \ + $(LDXMUFLAGS) -LIB = libSalomeDSImpl.la -LIB_SRC = SALOMEDSImpl_Tool.cxx \ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeDSImpl.la +libSalomeDSImpl_la_SOURCES =\ + SALOMEDSImpl_Tool.cxx \ SALOMEDSImpl_Callback.cxx \ SALOMEDSImpl_StudyHandle.cxx \ SALOMEDSImpl_GenericAttribute.cxx \ @@ -113,21 +131,19 @@ LIB_SRC = SALOMEDSImpl_Tool.cxx \ SALOMEDSImpl_Study.cxx \ SALOMEDSImpl_StudyManager.cxx +libSalomeDSImpl_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libSalomeDSImpl_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeDSImpl_la_LIBADD = $(COMMON_LIBS) - -CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) -CXXFLAGS+=$(OCC_CXXFLAGS) -LDFLAGS+= $(HDF5_LIBS) -lSalomeHDFPersist $(CAS_LDPATH) -lTKCAF -lTKBO -lTKLCAF -lTKMath -lTKStdSchema -lTKernel - -# _CS_gbo_090604 Ajout Spécifique Calibre 3, pour l'utilisation de la version 5.12 de la bibliothèque OCC. -# La bibliothèque OCC5.12 a été compilée sur Calibre 3 avec l'extention Xmu (impossible de compiler sans). -# On est donc obligé ici, pour permettre l'édition de lien avec les bibliothèques OCC, de spécifier le -# chemin d'accès aux bibliothèques Xmu # -LDXMUFLAGS= -L/usr/X11R6/lib -lXmu -LDFLAGS+=$(LDXMUFLAGS) -LDFLAGSFORBIN=$(LDFLAGS) -lSalomeHDFPersist - -@CONCLUDE@ +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = testDS +testDS_SOURCES = testDS.cxx +testDS_CPPFLAGS = $(COMMON_CPPFLAGS) +testDS_LDADD = libSalomeDSImpl.la $(COMMON_LIBS) +g++ "-DPACKAGE_NAME=\"Salome2 Project\"" -DPACKAGE_TARNAME=\"salome\" -DPACKAGE_VERSION=\"3.1.0\" "-DPACKAGE_STRING=\"Salome2 Project 3.1.0\"" -DPACKAGE_BUGREPORT=\"gboulant@CS\" -DPACKAGE=\"salome\" -DVERSION=\"3.1.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DHAVE_LIBDL=1 -DHAVE_LIBRT=1 -DHAVE_LIBM=1 -DHAVE_NAMESPACES= -D__x86__=1 -D__linux__=1 -D__OSVERSION__=1 -DOMNIORB=1 -DCORBA_HAVE_POA=1 -DCORBA_ORB_INIT_HAVE_3_ARGS=1 -DCORBA_ORB_INIT_THIRD_ARG=\"omniORB\" -DHAVE_GL_GL_H=1 -I. -I../../../KERNEL_SRC/src/SALOMEDSImpl -DOCC_VERSION_MAJOR=5 -DLIN -DLINTEL -DCSFDB -DNO_CXX_EXCEPTION -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I/local00/gboulant/salome/prerequis/occ524_patch/inc -I/local00/gboulant/salome/BR_auto_V310a2/build/include/salome -funsigned-char -I/local00/bourcier/TEST/SALOME2/prerequis/deb/hdf5-1.6.2/usr/include ../../../KERNEL_SRC/src/SALOMEDSImpl/../HDFPersist -DHAVE_SOCKET -pthread -g -D_DEBUG_ -Wno-deprecated -Wparentheses -Wreturn-type -Wunused -MT libSalomeDSImpl_la-SALOMEDSImpl_Tool.lo -MD -MP -MF .deps/libSalomeDSImpl_la-SALOMEDSImpl_Tool.Tpo -c ../../../KERNEL_SRC/src/SALOMEDSImpl/SALOMEDSImpl_Tool.cxx -fPIC -DPIC -o .libs/libSalomeDSImpl_la-SALOMEDSImpl_Tool.o diff --git a/src/TOOLSDS/Makefile.am b/src/TOOLSDS/Makefile.am new file mode 100644 index 000000000..c32394078 --- /dev/null +++ b/src/TOOLSDS/Makefile.am @@ -0,0 +1,63 @@ +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = SALOMEDS_Tool.hxx + +# +# =============================================================== +# Local definitions +# =============================================================== +# +LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOME_GenericObj.idl + +# Sources built from idl files +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOMEDS.hh $(top_builddir)/idl/SALOMEDSSK.cc \ + $(top_builddir)/idl/SALOMEDS_Attributes.hh $(top_builddir)/idl/SALOMEDS_AttributesSK.cc \ + $(top_builddir)/idl/SALOME_GenericObj.hh $(top_builddir)/idl/SALOME_GenericObjSK.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)/../Utils \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ \ + @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \ + @HDF5_INCLUDES@ \ + @BOOST_CPPFLAGS@ + +# This local variable defines the list of dependant libraries common to all target in this package. +COMMON_LIBS =\ + ../Utils/libOpUtil.la \ + @CAS_KERNEL@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libTOOLSDS.la +libTOOLSDS_la_SOURCES = \ + SALOMEDS_Tool.cxx \ + $(BUILT_SOURCES) + +libTOOLSDS_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libTOOLSDS_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libTOOLSDS_la_LIBADD = $(COMMON_LIBS) + +# +# =============================================================== +# Executables targets +# =============================================================== +# +# Nothing to build + + diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in deleted file mode 100644 index 866f491f1..000000000 --- a/src/TOOLSDS/Makefile.in +++ /dev/null @@ -1,36 +0,0 @@ -#============================================================================== -# File : Makefile.in -# Author : Marc Tajchman -#============================================================================== - -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl - - -@COMMENCE@ - -EXPORT_HEADERS = SALOMEDS_Tool.hxx - -# Libraries targets - -LIB = libTOOLSDS.la -LIB_SRC = \ - SALOMEDS_Tool.cxx \ - -# Executables targets -BIN = -BIN_SRC = -LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Exception.idl SALOME_GenericObj.idl -BIN_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl -BIN_CLIENT_IDL = - -CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS+=$(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) -LDFLAGS+= -lOpUtil $(CAS_LDPATH) -lTKernel - -@CONCLUDE@ - - diff --git a/src/TestContainer/Makefile.am b/src/TestContainer/Makefile.am new file mode 100644 index 000000000..0a06489e0 --- /dev/null +++ b/src/TestContainer/Makefile.am @@ -0,0 +1,104 @@ +# SALOME TestContainer : test of container creation and its life cycle +# +# 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 - MARC TAJCHMAN, CEA +# Module : SALOME +# $Header$ + + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +# Scripts to be installed +salomescript_DATA = SALOME_TestComponentPy.py TestComponentPy.py + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# 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)/../SALOMETraceCollector \ + -I$(srcdir)/../NamingService \ + -I$(srcdir)/../Utils \ + -I$(srcdir)/../Registry \ + -I$(srcdir)/../Notification \ + -I$(srcdir)/../ResourcesManager \ + -I$(srcdir)/../Container \ + -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 =\ + ../Container/libSalomeContainer.la \ + ../Registry/libRegistry.la \ + ../Notification/libSalomeNotification.la \ + ../ResourcesManager/libSalomeResourcesManager.la \ + ../NamingService/libSalomeNS.la \ + ../Utils/libOpUtil.la \ + ../SALOMELocalTrace/libSALOMELocalTrace.la \ + ../Basics/libSALOMEBasics.la + +# Sources built from idl files and required for building +BUILT_SOURCES =\ + $(top_builddir)/idl/SALOME_TestComponent.hh $(top_builddir)/idl/SALOME_TestComponentSK.cc \ + $(top_builddir)/idl/SALOME_Component.hh $(top_builddir)/idl/SALOME_ComponentSK.cc \ + $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeTestComponentEngine.la +libSalomeTestComponentEngine_la_SOURCES = SALOME_TestComponent_i.cxx $(BUILT_SOURCES) +libSalomeTestComponentEngine_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libSalomeTestComponentEngine_la_LIBADD = $(COMMON_LIBS) + +#LIB_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl SALOME_Exception.idl + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = TestContainer TestLogger +TestContainer_SOURCES = TestContainer.cxx +TestContainer_CPPFLAGS = $(COMMON_CPPFLAGS) +TestContainer_LDADD = $(COMMON_LIBS) libSalomeTestComponentEngine.la + +TestLogger_SOURCES = TestLogger.cxx +TestLogger_CPPFLAGS = $(COMMON_CPPFLAGS) +TestLogger_LDADD = $(COMMON_LIBS) libSalomeTestComponentEngine.la diff --git a/src/TestContainer/Makefile.in b/src/TestContainer/Makefile.in deleted file mode 100644 index 40a5e8e62..000000000 --- a/src/TestContainer/Makefile.in +++ /dev/null @@ -1,52 +0,0 @@ -# SALOME TestContainer : test of container creation and its life cycle -# -# 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 - MARC TAJCHMAN, CEA -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -EXPORT_PYSCRIPTS = SALOME_TestComponentPy.py TestComponentPy.py - -# Libraries targets - -LIB = libSalomeTestComponentEngine.la -LIB_SRC = SALOME_TestComponent_i.cxx -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl SALOME_Exception.idl - -# Executables targets -BIN = TestContainer TestLogger -BIN_SRC = - -LDFLAGS+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager -LDFLAGSFORBIN+= -lSalomeNotification -lSalomeNS -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSalomeResourcesManager -lSALOMEBasics - - -@CONCLUDE@ -- 2.39.2