From: boulant Date: Tue, 31 Jan 2006 18:24:55 +0000 (+0000) Subject: - Traitement des Makefile.in modifiés depuis V310a2, X-Git-Tag: BR_auto_V310__v_0_1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a3e51e57788b1d63060d62651853170622ddeed9;p=modules%2Fkernel.git - Traitement des Makefile.in modifiés depuis V310a2, - Prise en compte des répertoires de test + nouveaux répertoires --- diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index 42dedf940..000000000 --- a/Makefile.in +++ /dev/null @@ -1,150 +0,0 @@ -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 28/06/2001 -# $Header$ -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:@top_srcdir@/resources:./bin:@top_srcdir@/idl - - -@COMMENCE@ - -SUBDIRS = idl src doc salome_adm - -RESOURCES_FILES = \ -CatalogDataType.xml \ -KERNELCatalog.xml \ -CatalogResources.xml \ -close.png \ -config \ -channel.cfg \ -SALOMEDS_Resources - -BIN_SCRIPT= \ -runIDLparser \ -VERSION \ -orbmodule.py \ -runSalome.py \ -killSalome.py \ -killSalomeWithPort.py \ -runSalome \ -runSalome.csh \ -runNS.sh \ -createAppli.sh \ -launchConfigureParser.py \ -salome.launch \ -envSalome.py \ -salomeConsole.py \ -showNS.py \ -addToKillList.py \ -NSparam.py - -# copy header files in common directory -OWN_CONFIG_H=@OWN_CONFIG_H@ - -ifeq ($(OWN_CONFIG_H),yes) - ifeq ($(HAVE_SSTREAM),yes) - include_list=include/salome/SALOMEconfig.h include/salome/config.h - else - include_list=include/salome/SALOMEconfig.h include/salome/config.h include/salome/sstream - endif -else - ifeq ($(HAVE_SSTREAM),yes) - include_list=include/salome/SALOMEconfig.h - else - include_list=include/salome/SALOMEconfig.h include/salome/sstream - endif -endif - -inc: idl $(include_list) - -include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref - -$(RM) $@ - $(LN_S) ../../$< $@ - -# test if SALOMEconfig.h has changed (contents) -salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h - @if ! [ -a $@ ]; then \ - cp -p $< $@; \ - fi; \ - if ! cmp $< $@; then \ - cp -p $< $@; \ - fi; \ - -include/salome/config.h: salome_adm/unix/config.h - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/sstream: salome_adm/unix/sstream - -$(RM) $@ - $(LN_S) ../../$< $@ - -depend: depend_idl - -depend_idl: - (cd idl ; $(MAKE) $@) || exit 1 - -# doc is already build : if you want to had documents, go manually to doc and run 'make doc' -#doc: -# (cd doc && $(MAKE) $@) || exit 1 - -# Install make_commence make_conclude ... for other modules -install-make: - ($(INSTALL) -d $(incmakedir) || exit 1); - (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_commence > $(incmakedir)/make_commence || exit 1); - (sed 's/^prefix=/#prefix=/' $(top_builddir)/salome_adm/unix/make_conclude > $(incmakedir)/make_conclude || exit 1); - - -install-end: -# finish libtool install -# @$(LT) --mode=finish $(libdir) - -install-include: $(include_list) - $(INSTALL) -d $(includedir) - @for f in X $(include_list); do \ - if test $$f != X; then \ - (cp -p $$f $(includedir) || exit 1); \ - fi; \ - done - -# install script in $(bindir) : -install-appliskel: - $(INSTALL) -d $(bindir) - if test -d $(top_builddir)/bin/salome/appliskel; then \ - cp -rp $(top_builddir)/bin/salome/appliskel $(bindir); \ - fi; - -install-bin: $(BIN_SCRIPT) - $(INSTALL) -d $(bindir) - $(INSTALL_PROGRAM) $^ $(bindir) - -# install Plugin file -install-plugin: $(top_builddir)/share/salome/resources/Plugin - ($(INSTALL_DATA) $^ $(datadir)/resources/. || exit 1); \ - -uninstall: uninstall-idl - -uninstall-idl: - $(RM) $(idldir)/*.idl - -distclean: distclean-other - -distclean-other: - -$(RM) salome_adm/unix/*~ salome_adm/unix/*% salome_adm/unix/*.bak salome_adm/unix/*.new salome_adm/unix/*.old - -$(RM) salome_adm/unix/make_* - -$(RM) salome_adm/unix/depend salome_adm/unix/SALOMEconfig.h salome_adm/unix/config.h - -$(RM) config.cache config.log config.status - -@MODULE@ - -$(top_builddir)/share/salome/resources/Plugin: resources/Plugin - cp -f $< $@ ; \ - -resources: $(top_builddir)/share/salome/resources/Plugin - -install: install-bin install-appliskel install-include install-make install-plugin install-end diff --git a/bin/Makefile.am b/bin/Makefile.am index 55242ab16..20024d91a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -34,7 +34,8 @@ salomescript_SCRIPTS=\ createAppli.sh \ launchConfigureParser.py \ showNS.py \ - addToKillList.py + addToKillList.py \ + NSparam.py install: install-am install-appliskel diff --git a/clean_configure b/clean_configure index 29b9cd0bc..6cd590a11 100755 --- a/clean_configure +++ b/clean_configure @@ -13,4 +13,4 @@ rm -f config.guess config.sub ltmain.sh # Files created by automake rm -rf install-sh missing compile depcomp py-compile cd $here -find src -name Makefile.in | grep -v '/Test/' | xargs rm +find src -name Makefile.in | xargs rm diff --git a/configure.ac b/configure.ac index 08815f50a..daf82ade0 100644 --- a/configure.ac +++ b/configure.ac @@ -92,21 +92,6 @@ AC_ENABLE_STATIC(no) AC_LIBTOOL_DLOPEN AC_PROG_LIBTOOL -# _CS_gbo_ Concerning libtool, I observe a default in the libtool -# script generated whith standard libtool.m4. The LTCONFIG_VERSION is -# not defined and then a test interrupts the execution: -# libtool: ltconfig version `' does not match ltmain.sh version -# `1.3.5'. I keep the custom libtool.m4 while solving the problem. - - -dnl Fix up the INSTALL macro if it s a relative path. We want the -dnl full-path to the binary instead. -#case "$INSTALL" in -# *install-sh*) -# INSTALL="${ROOT_SRCDIR}/salome_adm/unix/config_files/install-sh -c" -# ;; -#esac - echo echo --------------------------------------------- echo testing C/C++ @@ -135,9 +120,6 @@ AC_CHECK_LIB(m,ceil) AC_CXX_USE_STD_IOSTREAM -# _CS_gbo doit pouvoir être substitué à la macro standard. Dans cecas, -# il faut mettre à jour le Makefile.in principal et supprimer le fichier -# sstream embarqué avec SALOME (obsolète). AC_CXX_HAVE_SSTREAM # Testing linker @@ -166,7 +148,6 @@ dnl testing MPI dnl --------------------------------------------- dnl -# _CS_gbo Is there a real dependency to CHECK_MPI dnl @@ -184,7 +165,7 @@ echo --------------------------------------------- echo dnl Several batch systems (OpenPBS, LSF, ...) can be operated using -dnl the Batch classe library integrated in the KERNEL module. The +dnl the Batch classes library integrated in the KERNEL module. The dnl checking process tests here the presence of underlying batch dnl softwares. If none is detected, the KERNEL is declared to be dnl "without batch". @@ -227,6 +208,7 @@ echo testing swig echo --------------------------------------------- echo +dnl _CS_gbo We should use here a variable given from the CHECK_PYTHON AM_PATH_PYTHON(2.3) CHECK_SWIG @@ -248,6 +230,7 @@ CHECK_CORBA CORBA_RULES=salome_adm/unix/make_$ORB AC_SUBST_FILE(CORBA_RULES) +# _CS_gbo: # The CORBA_RULES variable defines the file name that # implements the building rules to be included by Makefile to process # idl files and CORBA specific dependencies (ex: the file @@ -397,6 +380,7 @@ do done cd $ROOT_BUILDDIR +# _CS_gbo Check wether it's used or not!! AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript echo @@ -442,6 +426,7 @@ AC_OUTPUT([ \ ./src/Batch_SWIG/Makefile \ ./src/CASCatch/Makefile \ ./src/Communication/Makefile \ + ./src/Communication_SWIG/Makefile \ ./src/Container/Makefile \ ./src/DataTypeCatalog/Makefile \ ./src/GenericObj/Makefile \ @@ -457,6 +442,7 @@ AC_OUTPUT([ \ ./src/ModuleGenerator/testIDLparser \ ./src/MPIContainer/Makefile \ ./src/NamingService/Makefile \ + ./src/NamingService/Test/Makefile \ ./src/Notification/Makefile \ ./src/NOTIFICATION_SWIG/Makefile \ ./src/Registry/Makefile \ diff --git a/idl/Makefile.am b/idl/Makefile.am index e0acf6aba..139eeff84 100644 --- a/idl/Makefile.am +++ b/idl/Makefile.am @@ -24,7 +24,8 @@ IDL_FILES = \ SALOME_MPIContainer.idl \ Logger.idl \ SALOME_GenericObj.idl \ - SALOME_TestModuleCatalog.idl + SALOME_TestModuleCatalog.idl \ + nstest.idl # This variable defines the files to be installed salomeidl_DATA = $(IDL_FILES) diff --git a/src/CASCatch/Makefile.am b/src/CASCatch/Makefile.am index 5082e9caa..ba1f24b0a 100644 --- a/src/CASCatch/Makefile.am +++ b/src/CASCatch/Makefile.am @@ -18,4 +18,4 @@ libCASCatch_la_SOURCES = CASCatch_Failure.cxx \ libCASCatch_la_LDFLAGS = -no-undefined -version-info=0:0:0 libCASCatch_la_CPPFLAGS = @CAS_CPPFLAGS@ libCASCatch_la_CXXFLAGS = @CAS_CXXFLAGS@ -libCASCatch_la_LIBADD = @CAS_KERNEL@ +libCASCatch_la_LIBADD = @CAS_KERNEL@ @CAS_MATH@ diff --git a/src/CASCatch/Makefile.in b/src/CASCatch/Makefile.in deleted file mode 100644 index f3477a8a5..000000000 --- a/src/CASCatch/Makefile.in +++ /dev/null @@ -1,31 +0,0 @@ -# File : Makefile.in -# Author : Sergey RUIN (OCN) -# Module : SALOME - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_srcdir)/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= CASCatch_Failure.hxx \ - CASCatch_CatchSignals.hxx \ - CASCatch_ErrorHandler.hxx - -# Libraries targets -LIB = libCASCatch.la - -LIB_SRC = CASCatch_Failure.cxx \ - CASCatch_ErrorHandler.cxx \ - CASCatch_CatchSignals.cxx - -CPPFLAGS += $(OCC_INCLUDES) -CXXFLAGS += $(OCC_CXXFLAGS) -LDFLAGS+= $(CAS_KERNEL) $(CAS_MATH) - -@CONCLUDE@ - - diff --git a/src/Communication/Makefile.am b/src/Communication/Makefile.am index 3f5c436ac..a1e0ef50e 100644 --- a/src/Communication/Makefile.am +++ b/src/Communication/Makefile.am @@ -10,7 +10,8 @@ salomeinclude_HEADERS = \ ReceiverFactory.hxx \ SenderFactory.hxx \ SALOMEMultiComm.hxx \ - MultiCommException.hxx + MultiCommException.hxx \ + SALOME_Comm_i.hxx # Scripts to be installed diff --git a/src/Communication/Makefile.in b/src/Communication/Makefile.in deleted file mode 100644 index 15886f867..000000000 --- a/src/Communication/Makefile.in +++ /dev/null @@ -1,36 +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 \ - SALOME_Comm_i.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/Communication_SWIG/Makefile.am b/src/Communication_SWIG/Makefile.am new file mode 100644 index 000000000..66b72a5a2 --- /dev/null +++ b/src/Communication_SWIG/Makefile.am @@ -0,0 +1,100 @@ +# 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 + +# +# =============================================================== +# Swig targets +# =============================================================== +# (cf. http://www.geocities.com/foetsch/python/swig_linux.htm) +# +# Step 1: build the wrapping source files with swig +# +# libSALOME_Comm.i -- swig --> swig_wrap.cpp +# libSALOME_Comm.py +# +# Step 2: build the dynamic library from cpp built source files and +# dependant libraries. +# +# swig_wrap.cpp -- gcc --> swig_wrap.o |-- link --> _libSALOME_Comm.la +# + | +# dependant libs | +# +# The file libSALOME_Comm.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)/../Communication +SWIG_SOURCES = libSALOME_Comm.i + + +pkgpython_PYTHON = libSALOME_Comm.py +pkgpyexec_LTLIBRARIES = _libSALOME_Comm.la +_libSALOME_Comm_la_SOURCES = $(BUILT_SOURCES) $(SWIG_SOURCES) +_libSALOME_Comm_la_CPPFLAGS =\ + @PYTHON_INCLUDES@ \ + -I$(srcdir) -I$(srcdir)/../Communication \ + -I$(srcdir)/../Basics \ + -I$(srcdir)/../SALOMELocalTrace \ + -I$(srcdir)/../Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +_libSALOME_Comm_la_LDFLAGS = -module +_libSALOME_Comm_la_LIBADD = \ + ../Communication/libSalomeCommunication.la \ + @PYTHON_LIBS@ + +# _CS_gbo Actually, there's no need to get these flags optional. If +# the check mpi is not ok, the variables will be simply null. +if MPI_IS_OK +_libSALOME_Comm_la_CPPFLAGS+=@MPI_INCLUDES@ +_libSALOME_Comm_la_LIBADD+=@MPI_LIBS@ +endif + + +swig_wrap.cpp : $(SWIG_SOURCES) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +CLEANFILES = swig_wrap.cpp + + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# (see LifeCycleCORBA_SWIG for an example) + +# It's not needed to specify libSALOME_Comm.py. It is +# automaticaly installed through the swig target pkgpython_PYTHON. diff --git a/src/Communication_SWIG/Makefile.in b/src/Communication_SWIG/Makefile.in deleted file mode 100644 index 42f8f3fdd..000000000 --- a/src/Communication_SWIG/Makefile.in +++ /dev/null @@ -1,24 +0,0 @@ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -# header files -EXPORT_HEADERS= libSALOME_Comm.i - -# Libraries targets - -LIB = libSALOME_Commcmodule.la -LIB_SERVER_IDL = SALOME_Exception.idl - -SWIG_DEF = libSALOME_Comm.i -EXPORT_PYSCRIPTS = libSALOME_Comm.py - -CPPFLAGS+=$(PYTHON_INCLUDES) $(MPI_INCLUDES) -I$(top_srcdir)/src/Communication/src -LIBS+= $(PYTHON_LIBS) -LDFLAGS+= -lSalomeCommunication - -@CONCLUDE@ diff --git a/src/Container/Makefile.in b/src/Container/Makefile.in deleted file mode 100644 index cb00f685f..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_INCLUDES) $(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/HDFPersist/Makefile.am b/src/HDFPersist/Makefile.am index e4fa2ce47..a24d274f2 100644 --- a/src/HDFPersist/Makefile.am +++ b/src/HDFPersist/Makefile.am @@ -64,6 +64,7 @@ libSalomeHDFPersist_la_SOURCES =\ HDFdatasetGetSize.c \ HDFdatasetGetType.c \ HDFdatasetGetnDim.c \ + HDFdatasetGetOrder.c \ HDFattrOpen.c \ HDFattrClose.c \ HDFattrWrite.c \ @@ -90,4 +91,4 @@ libSalomeHDFPersist_la_LDFLAGS = -no-undefined -version-info=0:0:0 libSalomeHDFPersist_la_CPPFLAGS = @CAS_CPPFLAGS@ @HDF5_INCLUDES@ -DPCLINUX \ -I$(srcdir)/../SALOMELocalTrace \ -I$(srcdir)/../Basics -libSalomeHDFPersist_la_LIBADD = @CAS_LDPATH@ -lTKernel @HDF5_LIBS@ +libSalomeHDFPersist_la_LIBADD = @CAS_KERNEL@ @HDF5_LIBS@ diff --git a/src/HDFPersist/Makefile.in b/src/HDFPersist/Makefile.in deleted file mode 100644 index b3d95e0c3..000000000 --- a/src/HDFPersist/Makefile.in +++ /dev/null @@ -1,102 +0,0 @@ -# SALOME HDFPersist : implementation of HDF persitent ( save/ restore ) -# -# 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 = \ - HDFattribute.hxx \ - HDFcontainerObject.hxx \ - HDFdataset.hxx \ - HDFexplorer.hxx \ - HDFexception.hxx \ - HDFfile.hxx \ - HDFgroup.hxx \ - HDFinternalObject.hxx \ - HDFobject.hxx \ - HDFOI.hxx \ - HDFtypes.h \ - HDFconvert.hxx \ - hdfi.h \ - HDFascii.hxx - -# Libraries targets - -LIB = libSalomeHDFPersist.la -LIB_SRC = \ - HDFfileCreate.c \ - HDFfileClose.c \ - HDFfileOpen.c \ - HDFfileMount.c \ - HDFfileUmount.c \ - HDFgroupCreate.c \ - HDFgroupOpen.c \ - HDFgroupClose.c \ - HDFdatasetOpen.c \ - HDFdatasetClose.c \ - HDFdatasetCreate.c \ - HDFdatasetWrite.c \ - HDFdatasetRead.c \ - HDFdatasetGetDim.c \ - HDFdatasetGetSize.c \ - HDFdatasetGetType.c \ - HDFdatasetGetnDim.c \ - HDFdatasetGetOrder.c \ - HDFattrOpen.c \ - HDFattrClose.c \ - HDFattrWrite.c \ - HDFattrCreate.c \ - HDFattrRead.c \ - HDFattrGetType.c \ - HDFattrGetSize.c \ - HDFerrorModeLock.c \ - HDFnObjects.c \ - HDFobjectIdentify.c \ - HDFobjectType.c \ - HDFobject.cc \ - HDFinternalObject.cc \ - HDFattribute.cc \ - HDFcontainerObject.cc \ - HDFdataset.cc \ - HDFfile.cc \ - HDFgroup.cc \ - HDFexplorer.cc \ - HDFconvert.cc \ - HDFascii.cc - -#BIN = test9 test8 - -CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) -DPCLINUX -LDFLAGS+= $(CAS_KERNEL) $(HDF5_LIBS) - -@CONCLUDE@ diff --git a/src/KERNEL_PY/Makefile.am b/src/KERNEL_PY/Makefile.am index b4dff32d4..6950167fe 100755 --- a/src/KERNEL_PY/Makefile.am +++ b/src/KERNEL_PY/Makefile.am @@ -37,7 +37,8 @@ pkgpython_PYTHON = \ salome_kernel.py \ salome_study.py \ salome_iapp.py \ - salome_ComponentGUI.py + salome_ComponentGUI.py \ + omnipatch.py sharedpkgpython_PYTHON = kernel_shared_modules.py diff --git a/src/KERNEL_PY/Makefile.in b/src/KERNEL_PY/Makefile.in deleted file mode 100755 index f5f079c20..000000000 --- a/src/KERNEL_PY/Makefile.in +++ /dev/null @@ -1,38 +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 : Sergey RUIN, OCC -# Module : SALOME - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -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 omnipatch.py - -EXPORT_SHAREDPYSCRIPTS=kernel_shared_modules.py - -@CONCLUDE@ diff --git a/src/LifeCycleCORBA/Test/Makefile.am b/src/LifeCycleCORBA/Test/Makefile.am index cd434a108..c637e1284 100644 --- a/src/LifeCycleCORBA/Test/Makefile.am +++ b/src/LifeCycleCORBA/Test/Makefile.am @@ -52,7 +52,8 @@ RPATH=../.. 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_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc \ + $(top_builddir)/idl/nstest.hh $(top_builddir)/idl/nstestSK.cc # This local variable defines the list of CPPFLAGS common to all target in this package. @@ -61,7 +62,7 @@ COMMON_CPPFLAGS=\ -I$(srcdir)/$(RPATH)/Basics -I$(srcdir)/$(RPATH)/Basics/Test \ -I$(srcdir)/$(RPATH)/SALOMELocalTrace -I$(srcdir)/$(RPATH)/SALOMELocalTrace/Test \ -I$(srcdir)/$(RPATH)/SALOMETraceCollector -I$(srcdir)/$(RPATH)/SALOMETraceCollector/Test \ - -I$(srcdir)/$(RPATH)/NamingService \ + -I$(srcdir)/$(RPATH)/NamingService -I$(srcdir)/$(RPATH)/NamingService/Test \ -I$(srcdir)/$(RPATH)/Utils -I$(srcdir)/$(RPATH)/Utils/Test \ -I$(srcdir)/$(RPATH)/ResourcesManager \ -I$(srcdir)/$(RPATH)/LifeCycleCORBA \ @@ -101,5 +102,8 @@ libLifeCycleCORBATest_la_LIBADD = $(COMMON_LIBS) bin_PROGRAMS = TestLifeCycleCORBA TestLifeCycleCORBA_SOURCES = TestLifeCycleCORBA.cxx TestLifeCycleCORBA_CPPFLAGS = $(COMMON_CPPFLAGS) -TestLifeCycleCORBA_LDADD = libLifeCycleCORBATest.la ../libSalomeLifeCycleCORBA.la $(COMMON_LIBS) +TestLifeCycleCORBA_LDADD = \ + libLifeCycleCORBATest.la ../libSalomeLifeCycleCORBA.la \ + $(RPATH)/NamingService/Test/libNamingServiceTest.la \ + $(COMMON_LIBS) diff --git a/src/LifeCycleCORBA/Test/Makefile.in b/src/LifeCycleCORBA/Test/Makefile.in deleted file mode 100644 index cf8d73628..000000000 --- a/src/LifeCycleCORBA/Test/Makefile.in +++ /dev/null @@ -1,71 +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= LifeCycleCORBATest.hxx - -EXPORT_PYSCRIPTS = TestLifeCycleCORBA.py - -# Libraries targets - -LIB = libLifeCycleCORBATest.la -LIB_SRC = LifeCycleCORBATest.cxx -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ - SALOME_Exception.idl nstest.idl - -# Executables targets - -BIN = TestLifeCycleCORBA -BIN_SRC = - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGS+= - -LDFLAGSFORBIN+= \ - -lSALOMELocalTraceTest -lSALOMELocalTrace -lSALOMEBasics \ - -lSALOMETraceCollectorTest \ - -lUtilsTest -lOpUtil \ - -lNamingServiceTest -lSalomeNS \ - -lSalomeContainer -lSalomeResourcesManager \ - -lRegistry -lSalomeNotification \ - -lLifeCycleCORBATest -lSalomeLifeCycleCORBA - - -@CONCLUDE@ diff --git a/src/LifeCycleCORBA_SWIG/Makefile.am b/src/LifeCycleCORBA_SWIG/Makefile.am index 7fd00ff20..ab0aa0847 100644 --- a/src/LifeCycleCORBA_SWIG/Makefile.am +++ b/src/LifeCycleCORBA_SWIG/Makefile.am @@ -27,22 +27,6 @@ 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 diff --git a/src/MPIContainer/Makefile.am b/src/MPIContainer/Makefile.am new file mode 100644 index 000000000..30215a956 --- /dev/null +++ b/src/MPIContainer/Makefile.am @@ -0,0 +1,114 @@ +# SALOME MPIContainer : implemenation of container based on MPI libraries +# +# 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$ + + + +# +# =============================================================== +# _CS_gbo Caution !! This package may not work. I didn't test it +# because no mpi soft is installed on my computer. To be checked. +# =============================================================== +# + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = \ + MPIObject_i.hxx \ + MPIContainer_i.hxx + +# +# =============================================================== +# 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_MPIObject.hh $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ + $(top_builddir)/idl/SALOME_MPIContainer.hh $(top_builddir)/idl/SALOME_MPIContainerSK.cc + + +# This local variable defines the list of CPPFLAGS common to all target in this package. +# _CS_gbo See wether it can be shared by all packages in a common include!! +COMMON_CPPFLAGS=\ + @PYTHON_INCLUDES@ \ + @MPI_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 \ + ../Container/libSalomeContainer.la \ + @CORBA_LIBS@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeMPIContainer.la +libSalomeMPIContainer_la_SOURCES = MPIObject_i.cxx MPIContainer_i.cxx $(BUILT_SOURCES) +libSalomeMPIContainer_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libSalomeMPIContainer_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeMPIContainer_la_LIBADD = $(COMMON_LIBS) + + + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = SALOME_MPIContainer +SALOME_MPIContainer_SOURCES = SALOME_MPIContainer.cxx +SALOME_MPIContainer_LDADD = libSalomeMPIContainer.la @PYTHON_LIBS@ @MPI_LIBS@ +SALOME_MPIContainer_CPPFLAGS = $(COMMON_CPPFLAGS) + + diff --git a/src/MPIContainer/Makefile.in b/src/MPIContainer/Makefile.in deleted file mode 100644 index 808e9a422..000000000 --- a/src/MPIContainer/Makefile.in +++ /dev/null @@ -1,66 +0,0 @@ -# SALOME MPIContainer : implemenation of container based on MPI libraries -# -# 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 = \ - MPIObject_i.hxx \ - MPIContainer_i.hxx - -# Libraries targets - -LIB = libSalomeMPIContainer.la -LIB_SRC = MPIObject_i.cxx MPIContainer_i.cxx -LIB_CLIENT_IDL = SALOME_Component.idl -LIB_SERVER_IDL = SALOME_MPIObject.idl SALOME_MPIContainer.idl - -# Executables targets -BIN = SALOME_MPIContainer -BIN_SRC = -BIN_SERVER_IDL = SALOME_MPIObject.idl SALOME_MPIContainer.idl SALOME_Exception.idl - -CPPFLAGS+= $(PYTHON_INCLUDES) -LDFLAGS+= -lSalomeContainer -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification -lSALOMELocalTrace -lSalomeResourcesManager - -ifeq (@WITHMPI@,yes) - LIBS += $(PYTHON_LIBS) $(MPI_LIBS) - CXXFLAGS+=${MPI_INCLUDES} - CXX_DEPEND_FLAG+=${MPI_INCLUDES} - LDFLAGSFORBIN= $(LDFLAGS) -lSALOMEBasics - LIBSFORBIN= $(LIBS) -endif - -@CONCLUDE@ diff --git a/src/Makefile.am b/src/Makefile.am index ca13e4a26..fe3b8750c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -51,7 +51,9 @@ SUBDIRS = \ SALOMEDS \ KERNEL_PY \ ModuleGenerator \ - Communication + Communication \ + Communication_SWIG + # # The following packages are built under conditions. @@ -66,6 +68,7 @@ if CPPUNIT_IS_OK Logger/Test \ SALOMETraceCollector/Test \ Utils/Test \ + NamingService/Test \ LifeCycleCORBA/Test \ UnitTests endif diff --git a/src/Makefile.in b/src/Makefile.in deleted file mode 100644 index 2830eaca5..000000000 --- a/src/Makefile.in +++ /dev/null @@ -1,86 +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 : Patrick GOLDBRONN (CEA) -# Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - -SUBDIRS = \ - Basics \ - SALOMELocalTrace \ - CASCatch \ - HDFPersist \ - Logger \ - SALOMETraceCollector \ - Utils \ - NamingService \ - GenericObj \ - Registry \ - ModuleCatalog \ - DataTypeCatalog \ - RessourcesCatalog \ - ResourcesManager \ - Notification \ - NOTIFICATION_SWIG \ - Container \ - TestContainer \ - LifeCycleCORBA \ - LifeCycleCORBA_SWIG \ - SALOMEDSClient \ - TOOLSDS \ - SALOMEDSImpl \ - SALOMEDS \ - KERNEL_PY \ - ModuleGenerator \ - Communication \ - Communication_SWIG - -ifeq (@mpi_ok@,yes) - SUBDIRS+= MPIContainer TestMPIContainer -endif - -ifeq (@WITH_BATCH@,yes) - SUBDIRS += Batch Batch_SWIG -endif - -ifeq (@cppunit_ok@,yes) - SUBDIRS+= \ - Basics/Test \ - SALOMELocalTrace/Test \ - Logger/Test \ - SALOMETraceCollector/Test \ - Utils/Test \ - NamingService/Test \ - LifeCycleCORBA/Test \ - UnitTests -endif - -@MODULE@ - diff --git a/src/NamingService/Test/Makefile.am b/src/NamingService/Test/Makefile.am new file mode 100644 index 000000000..c9720d503 --- /dev/null +++ b/src/NamingService/Test/Makefile.am @@ -0,0 +1,100 @@ +# 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.am +# Author : Guillaume BOULANT (CSSI) +# Module : SALOME +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS= NamingServiceTest.hxx + +# Scripts to be installed +salomescript_SCRIPTS = TestNamingService.py + + +# +# =============================================================== +# Local definitions +# =============================================================== +# + +# This directory defines the subdirectory src in the top source directory. +RPATH=../.. + +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_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc \ + $(top_builddir)/idl/nstest.hh $(top_builddir)/idl/nstestSK.cc + +# This local variable defines the list of CPPFLAGS common to all target in this package. +COMMON_CPPFLAGS=\ + @CPPUNIT_INCLUDES@ -I$(srcdir)/$(RPATH)/NamingService \ + -I$(srcdir)/$(RPATH)/Basics \ + -I$(srcdir)/$(RPATH)/SALOMELocalTrace \ + -I$(srcdir)/$(RPATH)/Utils \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libNamingServiceTest.la +libNamingServiceTest_la_SOURCES = NamingServiceTest.cxx $(BUILT_SOURCES) +libNamingServiceTest_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libNamingServiceTest_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libNamingServiceTest_la_LIBADD = @CPPUNIT_LIBS@ + + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = TestNamingService +TestNamingService_SOURCES = TestNamingService.cxx +TestNamingService_CPPFLAGS = \ + $(COMMON_CPPFLAGS) \ + -I$(srcdir)/$(RPATH)/SALOMELocalTrace/Test \ + -I$(srcdir)/$(RPATH)/SALOMETraceCollector/Test \ + -I$(srcdir)/$(RPATH)/Utils/Test \ + -I$(srcdir)/$(RPATH)/Basics/Test + + +TestNamingService_LDADD = \ + libNamingServiceTest.la ../libSalomeNS.la \ + $(RPATH)/SALOMELocalTrace/Test/libSALOMELocalTraceTest.la $(RPATH)/SALOMELocalTrace/libSALOMELocalTrace.la \ + $(RPATH)/SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \ + $(RPATH)/Utils/Test/libUtilsTest.la $(RPATH)/Utils/libOpUtil.la \ + $(RPATH)/Basics/libSALOMEBasics.la diff --git a/src/NamingService/Test/Makefile.in b/src/NamingService/Test/Makefile.in deleted file mode 100644 index 36d8bcd17..000000000 --- a/src/NamingService/Test/Makefile.in +++ /dev/null @@ -1,70 +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= NamingServiceTest.hxx - -EXPORT_PYSCRIPTS = TestNamingService.py - -# Libraries targets - -LIB = libNamingServiceTest.la -LIB_SRC = NamingServiceTest.cxx - -LIB_SERVER_IDL = nstest.idl - -LIB_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ - SALOME_Exception.idl - -# Executables targets - -BIN = TestNamingService -BIN_SRC = - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGS+= - -LDFLAGSFORBIN+= \ - -lSALOMELocalTraceTest -lSALOMELocalTrace -lSALOMEBasics \ - -lSALOMETraceCollectorTest \ - -lUtilsTest -lOpUtil \ - -lSalomeNS - -@CONCLUDE@ diff --git a/src/SALOMEDS/Makefile.am b/src/SALOMEDS/Makefile.am index aa23803e0..b7bacf740 100644 --- a/src/SALOMEDS/Makefile.am +++ b/src/SALOMEDS/Makefile.am @@ -73,7 +73,7 @@ COMMON_LIBS =\ ../SALOMEDSImpl/libSalomeDSImpl.la \ ../GenericObj/libSalomeGenericObj.la \ ../LifeCycleCORBA/libSalomeLifeCycleCORBA.la \ - @CAS_LDPATH@ -lTKernel -lTKCAF -lTKBO -lTKStdSchema \ + @CAS_KERNEL@ \ @HDF5_LIBS@ \ $(LDXMUFLAGS) @@ -183,7 +183,7 @@ SALOMEDS_Server_CPPFLAGS = $(COMMON_CPPFLAGS) SALOMEDS_Server_LDADD = \ libSalomeDS.la $(COMMON_LIBS) \ ../ResourcesManager/libSalomeResourcesManager.la \ - -lTKLCAF -lTKMath \ + @CAS_OCAF@ \ @CORBA_LIBS@ SALOMEDS_Client_SOURCES = SALOMEDS_Client.cxx @@ -194,7 +194,3 @@ SALOMEDS_Client_LDADD = \ -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 96fb1ae2a..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_KERNEL) -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) $(CAS_OCAF) -lRegistry -lSalomeNotification -lSalomeContainer -lSalomeResourcesManager -lSALOMEBasics - -@CONCLUDE@ - - diff --git a/src/SALOMEDSImpl/Makefile.am b/src/SALOMEDSImpl/Makefile.am index a82949f1e..8a0f9b30d 100644 --- a/src/SALOMEDSImpl/Makefile.am +++ b/src/SALOMEDSImpl/Makefile.am @@ -74,7 +74,7 @@ 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 \ + @CAS_OCAF@ \ @HDF5_LIBS@ \ $(LDXMUFLAGS) @@ -144,6 +144,3 @@ 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/SALOMEDSImpl/Makefile.in b/src/SALOMEDSImpl/Makefile.in deleted file mode 100644 index fa73429a9..000000000 --- a/src/SALOMEDSImpl/Makefile.in +++ /dev/null @@ -1,133 +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_HEADERS= \ - SALOMEDSImpl_Attributes.hxx \ - SALOMEDSImpl_SObject.hxx \ - SALOMEDSImpl_SComponent.hxx \ - SALOMEDSImpl_Driver.hxx \ - SALOMEDSImpl_Callback.hxx \ - SALOMEDSImpl_ChildIterator.hxx \ - SALOMEDSImpl_GenericAttribute.hxx \ - SALOMEDSImpl_AttributeIOR.hxx \ - SALOMEDSImpl_AttributeExternalFileDef.hxx \ - SALOMEDSImpl_AttributeFileType.hxx \ - SALOMEDSImpl_AttributePersistentRef.hxx \ - SALOMEDSImpl_AttributeSequenceOfReal.hxx \ - SALOMEDSImpl_AttributeSequenceOfInteger.hxx \ - SALOMEDSImpl_AttributeDrawable.hxx \ - SALOMEDSImpl_AttributeSelectable.hxx \ - SALOMEDSImpl_AttributeExpandable.hxx \ - SALOMEDSImpl_AttributeOpened.hxx \ - SALOMEDSImpl_AttributeFlags.hxx \ - SALOMEDSImpl_AttributeGraphic.hxx \ - SALOMEDSImpl_AttributeTextColor.hxx \ - SALOMEDSImpl_AttributeTextHighlightColor.hxx \ - SALOMEDSImpl_AttributePixMap.hxx \ - SALOMEDSImpl_AttributeLocalID.hxx \ - SALOMEDSImpl_AttributeTarget.hxx \ - SALOMEDSImpl_AttributeTableOfInteger.hxx \ - SALOMEDSImpl_AttributeTableOfReal.hxx \ - SALOMEDSImpl_AttributeTableOfString.hxx \ - SALOMEDSImpl_AttributeStudyProperties.hxx \ - SALOMEDSImpl_AttributePythonObject.hxx \ - SALOMEDSImpl_AttributeReal.hxx \ - SALOMEDSImpl_AttributeInteger.hxx \ - SALOMEDSImpl_AttributeUserID.hxx \ - SALOMEDSImpl_AttributeTreeNode.hxx \ - SALOMEDSImpl_AttributeName.hxx \ - SALOMEDSImpl_AttributeComment.hxx \ - SALOMEDSImpl_AttributeReference.hxx \ - SALOMEDSImpl_UseCaseBuilder.hxx \ - SALOMEDSImpl_UseCaseIterator.hxx \ - SALOMEDSImpl_SComponentIterator.hxx \ - SALOMEDSImpl_StudyBuilder.hxx \ - SALOMEDSImpl_Study.hxx \ - SALOMEDSImpl_StudyManager.hxx \ - SALOMEDSImpl_OCAFApplication.hxx \ - SALOMEDSImpl_ChildNodeIterator.hxx \ - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = - -# Executables targets -BIN = testDS -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -# Libraries targets - -LIB = libSalomeDSImpl.la -LIB_SRC = SALOMEDSImpl_Tool.cxx \ - SALOMEDSImpl_Callback.cxx \ - SALOMEDSImpl_StudyHandle.cxx \ - SALOMEDSImpl_GenericAttribute.cxx \ - SALOMEDSImpl_SObject.cxx \ - SALOMEDSImpl_SComponent.cxx \ - SALOMEDSImpl_ChildIterator.cxx \ - SALOMEDSImpl_OCAFApplication.cxx \ - SALOMEDSImpl_AttributeIOR.cxx \ - SALOMEDSImpl_AttributeExternalFileDef.cxx \ - SALOMEDSImpl_AttributeFileType.cxx \ - SALOMEDSImpl_AttributePersistentRef.cxx \ - SALOMEDSImpl_AttributeSequenceOfReal.cxx \ - SALOMEDSImpl_AttributeSequenceOfInteger.cxx \ - SALOMEDSImpl_AttributeDrawable.cxx \ - SALOMEDSImpl_AttributeSelectable.cxx \ - SALOMEDSImpl_AttributeExpandable.cxx \ - SALOMEDSImpl_AttributeOpened.cxx \ - SALOMEDSImpl_AttributeFlags.cxx \ - SALOMEDSImpl_AttributeGraphic.cxx \ - SALOMEDSImpl_AttributeTextColor.cxx \ - SALOMEDSImpl_AttributeTextHighlightColor.cxx \ - SALOMEDSImpl_AttributePixMap.cxx \ - SALOMEDSImpl_AttributeLocalID.cxx \ - SALOMEDSImpl_AttributeTarget.cxx \ - SALOMEDSImpl_AttributeTableOfInteger.cxx \ - SALOMEDSImpl_AttributeTableOfReal.cxx \ - SALOMEDSImpl_AttributeTableOfString.cxx \ - SALOMEDSImpl_AttributeStudyProperties.cxx \ - SALOMEDSImpl_AttributePythonObject.cxx \ - SALOMEDSImpl_AttributeReal.cxx \ - SALOMEDSImpl_AttributeInteger.cxx \ - SALOMEDSImpl_AttributeUserID.cxx \ - SALOMEDSImpl_AttributeTreeNode.cxx \ - SALOMEDSImpl_AttributeName.cxx \ - SALOMEDSImpl_AttributeComment.cxx \ - SALOMEDSImpl_AttributeReference.cxx \ - SALOMEDSImpl_ChildNodeIterator.cxx \ - SALOMEDSImpl_UseCaseBuilder.cxx \ - SALOMEDSImpl_UseCaseIterator.cxx \ - SALOMEDSImpl_SComponentIterator.cxx \ - SALOMEDSImpl_StudyBuilder.cxx \ - SALOMEDSImpl_Study.cxx \ - SALOMEDSImpl_StudyManager.cxx - - - -CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) -CXXFLAGS+=$(OCC_CXXFLAGS) -LDFLAGS+= $(HDF5_LIBS) -lSalomeHDFPersist $(CAS_OCAF) - -# _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@ - - diff --git a/src/TOOLSDS/Makefile.in b/src/TOOLSDS/Makefile.in deleted file mode 100644 index 1b41aefa7..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_KERNEL) - -@CONCLUDE@ - - diff --git a/src/TestMPIContainer/Makefile.am b/src/TestMPIContainer/Makefile.am new file mode 100644 index 000000000..7e62acef3 --- /dev/null +++ b/src/TestMPIContainer/Makefile.am @@ -0,0 +1,110 @@ +# SALOME MPIContainer : implemenation of container based on MPI libraries +# +# 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$ + + + +# +# =============================================================== +# _CS_gbo Caution !! This package may not work. I didn't test it +# because no mpi soft is installed on my computer. To be checked. +# =============================================================== +# + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# +# =============================================================== +# Header to be installed +# =============================================================== +# +# header files +salomeinclude_HEADERS = TestMPIComponentEngine.hxx + +# +# =============================================================== +# 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_Logger.hh $(top_builddir)/idl/SALOME_LoggerSK.cc \ + $(top_builddir)/idl/SALOME_MPIObject.hh $(top_builddir)/idl/SALOME_MPIObjectSK.cc \ + $(top_builddir)/idl/SALOME_TestMPIComponent.hh $(top_builddir)/idl/SALOME_TestMPIComponentSK.cc + + +# This local variable defines the list of CPPFLAGS common to all target in this package. +# _CS_gbo See wether it can be shared by all packages in a common include!! +COMMON_CPPFLAGS=\ + @MPI_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 \ + ../Container/libSalomeContainer.la \ + @CORBA_LIBS@ + +# +# =============================================================== +# Libraries targets +# =============================================================== +# +lib_LTLIBRARIES = libSalomeTestMPIComponentEngine.la +libSalomeTestMPIComponentEngine_la_SOURCES = TestMPIComponentEngine.cxx $(BUILT_SOURCES) +libSalomeTestMPIComponentEngine_la_CPPFLAGS = $(COMMON_CPPFLAGS) +libSalomeTestMPIComponentEngine_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeTestMPIComponentEngine_la_LIBADD = $(COMMON_LIBS) + + + +# +# =============================================================== +# Executables targets +# =============================================================== +# +bin_PROGRAMS = TestMPIContainer +SALOME_TestMPIContainer_SOURCES = TestMPIContainer.cxx +SALOME_TestMPIContainer_LDADD = libSalomeTestMPIComponentEngine.la $(COMMON_LIBS) @MPI_LIBS@ +SALOME_TestMPIContainer_CPPFLAGS = $(COMMON_CPPFLAGS) diff --git a/src/TestMPIContainer/Makefile.in b/src/TestMPIContainer/Makefile.in deleted file mode 100644 index 000d291af..000000000 --- a/src/TestMPIContainer/Makefile.in +++ /dev/null @@ -1,39 +0,0 @@ -#============================================================================== -# File : Makefile.in -# Created : mer jui 04 12:58:13 CEST 2003 -# Author : Bernard SECHER, CEA -# Project : SALOME -# Copyright : CEA 2003 -# $Header$ -#============================================================================== - -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -EXPORT_PYSCRIPTS = - -EXPORT_HEADERS = TestMPIComponentEngine.hxx - -# Libraries targets - -LIB = libSalomeTestMPIComponentEngine.la -LIB_SRC = TestMPIComponentEngine.cxx -LIB_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_TestMPIComponent.idl SALOME_Component.idl - -# Executables targets -BIN = TestMPIContainer -BIN_SRC = -BIN_CLIENT_IDL = Logger.idl SALOME_MPIObject.idl SALOME_MPIContainer.idl SALOME_TestMPIComponent.idl SALOME_Exception.idl -BIN_SERVER_IDL = - -LDFLAGSFORBIN+= -lSalomeNotification -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeMPIContainer -lSalomeContainer -lRegistry -lOpUtil -lSALOMELocalTrace -lSALOMEBasics -lSalomeResourcesManager ${MPI_LIBS} - -CXXFLAGS+=${MPI_INCLUDES} -CXX_DEPEND_FLAG+=${MPI_INCLUDES} - -@CONCLUDE@ diff --git a/src/UnitTests/Makefile.am b/src/UnitTests/Makefile.am index 0466be708..22a1a939e 100644 --- a/src/UnitTests/Makefile.am +++ b/src/UnitTests/Makefile.am @@ -46,7 +46,8 @@ salomescript_SCRIPTS = UnitTests.py 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_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc + $(top_builddir)/idl/SALOME_Exception.hh $(top_builddir)/idl/SALOME_ExceptionSK.cc \ + $(top_builddir)/idl/nstest.hh $(top_builddir)/idl/nstestSK.cc bin_PROGRAMS = UnitTests UnitTests_SOURCES = UnitTests.cxx $(BUILT_SOURCES) @@ -55,7 +56,7 @@ UnitTests_CPPFLAGS =\ -I$(srcdir)/../Basics -I$(srcdir)/../Basics/Test \ -I$(srcdir)/../SALOMELocalTrace -I$(srcdir)/../SALOMELocalTrace/Test \ -I$(srcdir)/../SALOMETraceCollector -I$(srcdir)/../SALOMETraceCollector/Test \ - -I$(srcdir)/../NamingService \ + -I$(srcdir)/../NamingService -I$(srcdir)/../NamingService/Test \ -I$(srcdir)/../Utils -I$(srcdir)/../Utils/Test \ -I$(srcdir)/../Registry \ -I$(srcdir)/../Notification \ @@ -73,7 +74,7 @@ UnitTests_LDADD =\ ../Registry/libRegistry.la \ ../Notification/libSalomeNotification.la \ ../ResourcesManager/libSalomeResourcesManager.la \ - ../NamingService/libSalomeNS.la \ + ../NamingService/libSalomeNS.la ../NamingService/Test/libNamingServiceTest.la \ ../Container/libSalomeContainer.la \ ../SALOMETraceCollector/Test/libSALOMETraceCollectorTest.la \ ../Utils/libOpUtil.la ../Utils/Test/libUtilsTest.la \ diff --git a/src/UnitTests/Makefile.in b/src/UnitTests/Makefile.in deleted file mode 100644 index f7651111f..000000000 --- a/src/UnitTests/Makefile.in +++ /dev/null @@ -1,69 +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@ - -# header files -EXPORT_HEADERS= - -EXPORT_PYSCRIPTS = UnitTests.py - -# Libraries targets - -LIB = -LIB_SRC = - -# Executables targets - -BIN = UnitTests -BIN_SRC = -BIN_CLIENT_IDL = SALOME_Component.idl SALOME_TestComponent.idl \ - SALOME_Exception.idl nstest.idl - -CXXFLAGS += @CPPUNIT_INCLUDES@ -CPPFLAGS += @CPPUNIT_INCLUDES@ - -LIBS= @LIBS@ @CPPUNIT_LIBS@ - -LDFLAGSFORBIN+= \ - -lSALOMELocalTraceTest -lSALOMELocalTrace -lSALOMEBasics \ - -lSALOMETraceCollectorTest \ - -lUtilsTest -lOpUtil \ - -lNamingServiceTest -lSalomeNS \ - -lSalomeContainer -lSalomeResourcesManager \ - -lRegistry -lSalomeNotification \ - -lLifeCycleCORBATest -lSalomeLifeCycleCORBA \ - - - -@CONCLUDE@