From f22c12f12541c63f7bd040c690f034d66f5b88d1 Mon Sep 17 00:00:00 2001 From: boulant Date: Fri, 18 Nov 2005 19:40:54 +0000 Subject: [PATCH] =?utf8?q?Adaptation=20pour=20le=20passage=20en=20automake?= =?utf8?q?.=20Seuls=20les=205=20premiers=20paquets=20des=20sources=20sont?= =?utf8?q?=20pass=C3=A9s=20et=20le=20r=C3=A9pertoire=20idl?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- AUTHORS | 0 COPYING | 340 ++++++++++++++++++ ChangeLog | 0 Makefile.in => DEPRECATED/Makefile.in | 0 Makefile.am | 9 + NEWS | 0 build_configure | 17 +- clean_configure | 11 +- configure.ac | 6 +- idl/Makefile.am | 50 +++ idl/Makefile.in | 83 ----- .../{ => DEPRECATED}/config.guess | 0 .../config_files/{ => DEPRECATED}/config.sub | 0 .../config_files/{ => DEPRECATED}/install-sh | 0 .../config_files/{ => DEPRECATED}/libtool.m4 | 0 .../config_files/{ => DEPRECATED}/ltconfig | 0 .../config_files/{ => DEPRECATED}/ltmain.sh | 0 .../config_files/{ => DEPRECATED}/missing | 0 .../{ => DEPRECATED}/mkinstalldirs | 0 salome_adm/unix/make_common_starter.am | 10 + src/Basics/{Makefile.in => Makefile.am} | 29 +- src/CASCatch/Makefile.am | 21 ++ src/CASCatch/Makefile.in | 31 -- src/HDFPersist/{Makefile.in => Makefile.am} | 27 +- src/Logger/Makefile.am | 53 +++ src/Logger/Makefile.in | 40 --- src/Logger/SALOME_Logger_Server.cxx | 104 ------ src/Logger/SALOME_Logger_Server_main.cxx | 121 +++++++ .../Makefile.in => Makefile.am} | 60 ++-- .../Makefile.am} | 80 +---- 30 files changed, 690 insertions(+), 402 deletions(-) create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog rename Makefile.in => DEPRECATED/Makefile.in (100%) create mode 100644 Makefile.am create mode 100644 NEWS create mode 100644 idl/Makefile.am delete mode 100644 idl/Makefile.in rename salome_adm/unix/config_files/{ => DEPRECATED}/config.guess (100%) rename salome_adm/unix/config_files/{ => DEPRECATED}/config.sub (100%) rename salome_adm/unix/config_files/{ => DEPRECATED}/install-sh (100%) rename salome_adm/unix/config_files/{ => DEPRECATED}/libtool.m4 (100%) rename salome_adm/unix/config_files/{ => DEPRECATED}/ltconfig (100%) rename salome_adm/unix/config_files/{ => DEPRECATED}/ltmain.sh (100%) rename salome_adm/unix/config_files/{ => DEPRECATED}/missing (100%) rename salome_adm/unix/config_files/{ => DEPRECATED}/mkinstalldirs (100%) create mode 100644 salome_adm/unix/make_common_starter.am rename src/Basics/{Makefile.in => Makefile.am} (74%) create mode 100644 src/CASCatch/Makefile.am delete mode 100644 src/CASCatch/Makefile.in rename src/HDFPersist/{Makefile.in => Makefile.am} (79%) create mode 100644 src/Logger/Makefile.am delete mode 100644 src/Logger/Makefile.in create mode 100644 src/Logger/SALOME_Logger_Server_main.cxx rename src/{SALOMELocalTrace/Makefile.in => Makefile.am} (64%) rename src/{Makefile.in => SALOMELocalTrace/Makefile.am} (52%) diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 000000000..e69de29bb diff --git a/COPYING b/COPYING new file mode 100644 index 000000000..d60c31a97 --- /dev/null +++ b/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program 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 General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 000000000..e69de29bb diff --git a/Makefile.in b/DEPRECATED/Makefile.in similarity index 100% rename from Makefile.in rename to DEPRECATED/Makefile.in diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 000000000..4a3aa98ac --- /dev/null +++ b/Makefile.am @@ -0,0 +1,9 @@ +# -* Makefile *- +# +# Author : Guillaume BOULANT (CSSI) +# Date : 09/11/2005 +# $Header$ +# + +SUBDIRS = idl src doc salome_adm + diff --git a/NEWS b/NEWS new file mode 100644 index 000000000..e69de29bb diff --git a/build_configure b/build_configure index c10e70c53..79a07a0f1 100755 --- a/build_configure +++ b/build_configure @@ -13,20 +13,25 @@ # 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 -# This creates the configure script from the file configure.ac (or -# configure.in if configure.ac doesn't exist) -autoconf - # 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). -#libtoolize --force +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 # 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). -#automake -a -c +echo "====================================================== automake" +automake --add-missing --copy --gnu + diff --git a/clean_configure b/clean_configure index fa537bc92..8211475dc 100755 --- a/clean_configure +++ b/clean_configure @@ -2,13 +2,14 @@ rm -rf autom4te.cache aclocal.m4 configure make_config rm -f *~ -exit +#exit +# ==================== ON SORT AVANT here=`pwd` libdir=salome_adm/unix/config_files -#cd $libdir +cd $libdir # Files created by libtoolize -#rm -f config.guess config.sub ltmain.sh +rm -f config.guess config.sub ltmain.sh # Files created by automake -#rm -rf install-sh missing -#cd $here +rm -rf install-sh missing +cd $here diff --git a/configure.ac b/configure.ac index 8f41f48d7..953664128 100644 --- a/configure.ac +++ b/configure.ac @@ -4,13 +4,15 @@ # ================================================================ # #AC_PREREQ(2.59) -AC_INIT(src) -#AM_INIT_AUTOMAKE +#AC_INIT(src) +AC_INIT([Salome2 Project], [3.1.0], [gboulant@CS], [salome]) # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary # scripts such as config.guess, install-sh, ... AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CANONICAL_HOST +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE PACKAGE=salome AC_SUBST(PACKAGE) diff --git a/idl/Makefile.am b/idl/Makefile.am new file mode 100644 index 000000000..7ec84f5cd --- /dev/null +++ b/idl/Makefile.am @@ -0,0 +1,50 @@ + +# +# This Makefile is responsible of generating the client and server +# implementation of IDL interfaces for both C++ and python usage. +# The building process of the C++ files is in charge of each source +# package and then is not manage here. +# + +IDL_FILES = \ + SALOME_Exception.idl \ + SALOME_Comm.idl \ + SALOME_ModuleCatalog.idl \ + SALOME_DataTypeCatalog.idl \ + SALOME_RessourcesCatalog.idl \ + SALOMEDS.idl \ + SALOMEDS_Attributes.idl \ + SALOME_Component.idl \ + SALOME_ContainerManager.idl \ + SALOME_TestComponent.idl \ + SALOME_Registry.idl \ + SALOME_MPIObject.idl \ + SALOME_MPIContainer.idl \ + Logger.idl \ + SALOME_GenericObj.idl \ + SALOME_TestModuleCatalog.idl + + +# These variables defines the file extentions for clt and srv CORBA +# files generated from the IDL files. +OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ +OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +OMNIORB_IDL_CLN_OBJ = @OMNIORB_IDL_CLN_OBJ@ + +OMNIORB_IDL_SRV_H = @OMNIORB_IDL_SRV_H@ +OMNIORB_IDL_SRV_CXX = @OMNIORB_IDL_SRV_CXX@ +OMNIORB_IDL_SRV_OBJ = @OMNIORB_IDL_SRV_OBJ@ + +# These variables defines the building process of CORBA files +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl +IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/salome/idl + +# Target for generating the stub from the IDL files. The stubs are +# created in the current build directory. +%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_srcdir}/idl/%.idl + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< + + +all: $(IDL_FILES:%.idl=%$(OMNIORB_IDL_CLN_CXX)) $(IDL_FILES:%.idl=%$(OMNIORB_IDL_CLN_H)) diff --git a/idl/Makefile.in b/idl/Makefile.in deleted file mode 100644 index 9ac8e2c24..000000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,83 +0,0 @@ -# -# generate dependencies for idl file : -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=. - -@COMMENCE@ - -IDL_FILES = \ - SALOME_Exception.idl \ - SALOME_Comm.idl \ - SALOME_ModuleCatalog.idl \ - SALOME_DataTypeCatalog.idl \ - SALOME_RessourcesCatalog.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_Component.idl \ - SALOME_ContainerManager.idl \ - SALOME_TestComponent.idl \ - SALOME_Registry.idl \ - SALOME_MPIObject.idl \ - SALOME_MPIContainer.idl \ - Logger.idl \ - SALOME_GenericObj.idl \ - SALOME_TestModuleCatalog.idl - -PY_CLIENT_IDL = $(IDL_FILES) - -# we copy all idl file in $(top_builddir)/idl -inc: $(top_builddir)/idl/salome $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(top_builddir)/idl/salome: - mkdir -p $@ - -$(IDL_FILES:%=$(top_builddir)/idl/salome/%):$(IDL_FILES:%=$(top_srcdir)/idl/%) -# $(CP) $< $@ - cp -f $^ $(top_builddir)/idl/salome - - -lib: pyidl - -PYTHON_BUILD_SITE=$(top_builddir)/lib/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ - -pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) - -$(PYTHON_BUILD_SITE): - $(INSTALL) -d $@ - -$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< - - -# install python client (generated from idl file -install: $(top_builddir)/idl/salome install-pyidl install-idl - -# create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(idldir) - cp -p -f $^ $(idldir) - - -install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(PYTHON_SITE_INSTALL) - @for file in $^ dummy; do \ - if [ $$file != "dummy" ]; then \ - $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ - fi ; \ - done ; - -#@ CONCLUDE @ - -cleandep: - -$(RM) .dep* - -distclean: - -$(RM) *.py - -$(RM) $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - -$(RM) Makefile - diff --git a/salome_adm/unix/config_files/config.guess b/salome_adm/unix/config_files/DEPRECATED/config.guess similarity index 100% rename from salome_adm/unix/config_files/config.guess rename to salome_adm/unix/config_files/DEPRECATED/config.guess diff --git a/salome_adm/unix/config_files/config.sub b/salome_adm/unix/config_files/DEPRECATED/config.sub similarity index 100% rename from salome_adm/unix/config_files/config.sub rename to salome_adm/unix/config_files/DEPRECATED/config.sub diff --git a/salome_adm/unix/config_files/install-sh b/salome_adm/unix/config_files/DEPRECATED/install-sh similarity index 100% rename from salome_adm/unix/config_files/install-sh rename to salome_adm/unix/config_files/DEPRECATED/install-sh diff --git a/salome_adm/unix/config_files/libtool.m4 b/salome_adm/unix/config_files/DEPRECATED/libtool.m4 similarity index 100% rename from salome_adm/unix/config_files/libtool.m4 rename to salome_adm/unix/config_files/DEPRECATED/libtool.m4 diff --git a/salome_adm/unix/config_files/ltconfig b/salome_adm/unix/config_files/DEPRECATED/ltconfig similarity index 100% rename from salome_adm/unix/config_files/ltconfig rename to salome_adm/unix/config_files/DEPRECATED/ltconfig diff --git a/salome_adm/unix/config_files/ltmain.sh b/salome_adm/unix/config_files/DEPRECATED/ltmain.sh similarity index 100% rename from salome_adm/unix/config_files/ltmain.sh rename to salome_adm/unix/config_files/DEPRECATED/ltmain.sh diff --git a/salome_adm/unix/config_files/missing b/salome_adm/unix/config_files/DEPRECATED/missing similarity index 100% rename from salome_adm/unix/config_files/missing rename to salome_adm/unix/config_files/DEPRECATED/missing diff --git a/salome_adm/unix/config_files/mkinstalldirs b/salome_adm/unix/config_files/DEPRECATED/mkinstalldirs similarity index 100% rename from salome_adm/unix/config_files/mkinstalldirs rename to salome_adm/unix/config_files/DEPRECATED/mkinstalldirs diff --git a/salome_adm/unix/make_common_starter.am b/salome_adm/unix/make_common_starter.am new file mode 100644 index 000000000..8b3a7b6e8 --- /dev/null +++ b/salome_adm/unix/make_common_starter.am @@ -0,0 +1,10 @@ +# +# ============================================================ +# This file defines the common definitions used in several +# Makefile. This file must be included, if needed, by the file +# Makefile.am. +# ============================================================ +# + +salomeincludedir = $(includedir)/@PACKAGE@ +libdir = $(prefix)/lib/@PACKAGE@ diff --git a/src/Basics/Makefile.in b/src/Basics/Makefile.am similarity index 74% rename from src/Basics/Makefile.in rename to src/Basics/Makefile.am index 612581468..e5a9195e6 100644 --- a/src/Basics/Makefile.in +++ b/src/Basics/Makefile.am @@ -26,27 +26,10 @@ # Module : SALOME # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +salomeincludedir = $(includedir)/@PACKAGE@ +salomeinclude_HEADERS = BasicsGenericDestructor.hxx - -@COMMENCE@ - -# header files -EXPORT_HEADERS= \ - BasicsGenericDestructor.hxx - -EXPORT_PYSCRIPTS = - -# Libraries targets - -LIB = libSALOMEBasics.la -LIB_SRC = BasicsGenericDestructor.cxx - -LIBS= @LIBS@ -#LDFLAGS+= - - -@CONCLUDE@ +libdir = $(prefix)/lib/@PACKAGE@ +lib_LTLIBRARIES = libSALOMEBasics.la +libSALOMEBasics_la_SOURCES = BasicsGenericDestructor.cxx BasicsGenericDestructor.hxx +libSALOMEBasics_la_LDFLAGS = -no-undefined -version-info=0:0:0 diff --git a/src/CASCatch/Makefile.am b/src/CASCatch/Makefile.am new file mode 100644 index 000000000..5082e9caa --- /dev/null +++ b/src/CASCatch/Makefile.am @@ -0,0 +1,21 @@ +# File : Makefile.in +# Author : Sergey RUIN (OCN) +# Module : SALOME + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + + +salomeinclude_HEADERS = CASCatch_Failure.hxx \ + CASCatch_CatchSignals.hxx \ + CASCatch_ErrorHandler.hxx + +# Libraries targets +lib_LTLIBRARIES = libCASCatch.la +libCASCatch_la_SOURCES = CASCatch_Failure.cxx \ + CASCatch_ErrorHandler.cxx \ + CASCatch_CatchSignals.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@ diff --git a/src/CASCatch/Makefile.in b/src/CASCatch/Makefile.in deleted file mode 100644 index f6e17c1e8..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) - -@CONCLUDE@ - - diff --git a/src/HDFPersist/Makefile.in b/src/HDFPersist/Makefile.am similarity index 79% rename from src/HDFPersist/Makefile.in rename to src/HDFPersist/Makefile.am index 6fe8916d2..e4fa2ce47 100644 --- a/src/HDFPersist/Makefile.in +++ b/src/HDFPersist/Makefile.am @@ -26,15 +26,9 @@ # Module : SALOME # $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_HEADERS = \ +salomeinclude_HEADERS = \ HDFattribute.hxx \ HDFcontainerObject.hxx \ HDFdataset.hxx \ @@ -51,9 +45,8 @@ EXPORT_HEADERS = \ HDFascii.hxx # Libraries targets - -LIB = libSalomeHDFPersist.la -LIB_SRC = \ +lib_LTLIBRARIES = libSalomeHDFPersist.la +libSalomeHDFPersist_la_SOURCES =\ HDFfileCreate.c \ HDFfileClose.c \ HDFfileOpen.c \ @@ -93,10 +86,8 @@ LIB_SRC = \ HDFconvert.cc \ HDFascii.cc -#BIN = test9 test8 - -CPPFLAGS+=$(OCC_INCLUDES) $(HDF5_INCLUDES) -DPCLINUX -LDFLAGS+= $(CAS_LDPATH) -lTKernel $(HDF5_LIBS) - - -@CONCLUDE@ +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@ diff --git a/src/Logger/Makefile.am b/src/Logger/Makefile.am new file mode 100644 index 000000000..322fef611 --- /dev/null +++ b/src/Logger/Makefile.am @@ -0,0 +1,53 @@ +# SALOME Logger : CORBA server managing trace output +# +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# File : Makefile.am +# Author : Guillaume BOULANT, CSSI +# Module : KERNEL +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + SALOME_Trace.hxx + +# Program files +bin_PROGRAMS = SALOME_Logger_Server +SALOME_Logger_Server_SOURCES = SALOME_Logger_Server_main.cxx +SALOME_Logger_Server_LDADD = libSalomeLoggerServer.la + +# Libraries targets +lib_LTLIBRARIES = libSalomeLoggerServer.la +libSalomeLoggerServer_la_SOURCES =\ + SALOME_Trace.cxx \ + SALOME_Logger_Server.cxx \ + Logger.hh LoggerSK.cc +libSalomeLoggerServer_la_LDFLAGS = -no-undefined -version-info=0:0:0 + +BUILT_SOURCES = Logger.hh LoggerSK.cc + +# These variables defines the building process of CORBA files +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/salome/idl +IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/salome/idl + +Logger.hh LoggerSK.cc: $(top_srcdir)/idl/Logger.idl + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< + +#LIB_SERVER_IDL = Logger.idl + +#salomedatadir = +#salomedata_DATA = SALOME_Trace.py + +# Executables targets +#bin_SCRIPTS = SALOME_Trace.py +#bin_PROGRAMS = SALOME_Logger_Server + +#EXPORT_PYSCRIPTS = SALOME_Trace.py + + +#BIN_SERVER_IDL = Logger.idl +#BIN_CLIENT_IDL = Logger.idl diff --git a/src/Logger/Makefile.in b/src/Logger/Makefile.in deleted file mode 100644 index f03c9adde..000000000 --- a/src/Logger/Makefile.in +++ /dev/null @@ -1,40 +0,0 @@ -# SALOME Logger : CORBA server managing trace output -# -# Copyright (C) 2003 CEA/DEN, EDF R&D -# -# -# -# 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= \ - SALOME_Trace.hxx - -# Libraries targets -LIB = libSalomeLoggerServer.la -LIB_SRC=\ - SALOME_Trace.cxx \ - SALOME_Logger_Server.cxx -LIB_SERVER_IDL = Logger.idl - -EXPORT_PYSCRIPTS = SALOME_Trace.py - -# Executables targets -BIN = SALOME_Logger_Server -BIN_SRC = -BIN_SERVER_IDL = Logger.idl -BIN_CLIENT_IDL = Logger.idl - -@CONCLUDE@ - diff --git a/src/Logger/SALOME_Logger_Server.cxx b/src/Logger/SALOME_Logger_Server.cxx index 4464c835b..507118237 100644 --- a/src/Logger/SALOME_Logger_Server.cxx +++ b/src/Logger/SALOME_Logger_Server.cxx @@ -62,107 +62,3 @@ void Logger::ping() { //cout<<" Logger::ping() pid "<< getpid()< 2) - { - std::cout << "usage: SALOME_Logger_Server [output_file]" << std::endl; - exit(1); - } - try - { - //Initialize the ORB - const long TIMESleep = 250000000; - const int NumberOfTries = 40; - int i; - timespec ts_req = {0, TIMESleep}; - timespec ts_rem = {0, 0}; - CosNaming::NamingContext_var inc; - SALOME_Logger::Logger_var myLoggerRef; - CORBA::Object_var theObj; - Logger* myLogger; - CORBA::Object_var obj; - PortableServer::POA_var poa; - PortableServer::POAManager_var pman; - - CORBA::ORB_var orb = CORBA::ORB_init(argc, argv) ; - - for (i = 1; i <= NumberOfTries; i++) - { -#ifndef WNT - if (i != 1) nanosleep(&ts_req, &ts_rem); -#else - if (i != 1) Sleep(TIMESleep / 1000000); -#endif - try - { - obj = orb->resolve_initial_references("RootPOA") ; - if(!CORBA::is_nil(obj)) - poa = PortableServer::POA::_narrow(obj) ; - pman = poa->the_POAManager(); - // NB. You can activate the POA before or after - // activating objects in that POA. - - // This activates the object in the root POA (by default), and - // returns a reference to it. - //NB. You can't use SALOME_NamingService class because it uses MESSAGE macro - //Otherwise, you will get segmentation fault. - //Get initial naming context - if(!CORBA::is_nil(orb)) - theObj = orb->resolve_initial_references("NameService"); - //Narrow to NamingContext - if (!CORBA::is_nil(theObj)) - inc = CosNaming::NamingContext::_narrow(theObj); - } catch(CORBA::COMM_FAILURE&) { - //cout<<"Logger Server: CORBA::COMM_FAILURE: Unable to contact the Naming Service"<_this(); - CosNaming::Name name; - name.length(1); - name[0].id = CORBA::string_dup("Logger"); - inc->bind(name,myLoggerRef); - myLogger->_remove_ref(); - pman->activate(); - orb->run() ; - orb->destroy() ; - } - catch(CORBA::COMM_FAILURE& ex) - { - std::cerr << "Caught system exception COMM_FAILURE -- unable to contact the " - << "object." << std::endl; - } - catch(CORBA::SystemException&) - { - std::cerr << "Caught CORBA::SystemException." << std::endl; - } - catch(CORBA::Exception&) - { - std::cerr << "Caught CORBA::Exception." << std::endl; - } - catch(omniORB::fatalException& fe) - { - std::cerr << "Caught omniORB::fatalException:" << std::endl; - std::cerr << " file: " << fe.file() << std::endl; - std::cerr << " line: " << fe.line() << std::endl; - std::cerr << " mesg: " << fe.errmsg() << std::endl; - } - catch(...) - { - std::cerr << "Caught unknown exception." << std::endl; - } - return 0; -} diff --git a/src/Logger/SALOME_Logger_Server_main.cxx b/src/Logger/SALOME_Logger_Server_main.cxx new file mode 100644 index 000000000..c6a5aa6be --- /dev/null +++ b/src/Logger/SALOME_Logger_Server_main.cxx @@ -0,0 +1,121 @@ +// SALOME Logger : CORBA server managing trace output +// +// Copyright (C) 2003 CEA/DEN, EDF R&D +// +// +// +// File : SALOME_Logger_Server.cxx +// Author : Vasily Rusyaev +// Module : SALOME + +#include +#include "SALOME_Logger_Server.hxx" +#include +#include +#ifndef __WIN32__ +# include +#endif + +int main(int argc, char **argv) +{ + if (argc > 2) + { + std::cout << "usage: SALOME_Logger_Server [output_file]" << std::endl; + exit(1); + } + try + { + //Initialize the ORB + const long TIMESleep = 250000000; + const int NumberOfTries = 40; + int i; + timespec ts_req = {0, TIMESleep}; + timespec ts_rem = {0, 0}; + CosNaming::NamingContext_var inc; + SALOME_Logger::Logger_var myLoggerRef; + CORBA::Object_var theObj; + Logger* myLogger; + CORBA::Object_var obj; + PortableServer::POA_var poa; + PortableServer::POAManager_var pman; + + CORBA::ORB_var orb = CORBA::ORB_init(argc, argv) ; + + for (i = 1; i <= NumberOfTries; i++) + { +#ifndef WNT + if (i != 1) nanosleep(&ts_req, &ts_rem); +#else + if (i != 1) Sleep(TIMESleep / 1000000); +#endif + try + { + obj = orb->resolve_initial_references("RootPOA") ; + if(!CORBA::is_nil(obj)) + poa = PortableServer::POA::_narrow(obj) ; + pman = poa->the_POAManager(); + // NB. You can activate the POA before or after + // activating objects in that POA. + + // This activates the object in the root POA (by default), and + // returns a reference to it. + //NB. You can't use SALOME_NamingService class because it uses MESSAGE macro + //Otherwise, you will get segmentation fault. + //Get initial naming context + if(!CORBA::is_nil(orb)) + theObj = orb->resolve_initial_references("NameService"); + //Narrow to NamingContext + if (!CORBA::is_nil(theObj)) + inc = CosNaming::NamingContext::_narrow(theObj); + } catch(CORBA::COMM_FAILURE&) { + //cout<<"Logger Server: CORBA::COMM_FAILURE: Unable to contact the Naming Service"<_this(); + CosNaming::Name name; + name.length(1); + name[0].id = CORBA::string_dup("Logger"); + inc->bind(name,myLoggerRef); + myLogger->_remove_ref(); + pman->activate(); + orb->run() ; + orb->destroy() ; + } + catch(CORBA::COMM_FAILURE& ex) + { + std::cerr << "Caught system exception COMM_FAILURE -- unable to contact the " + << "object." << std::endl; + } + catch(CORBA::SystemException&) + { + std::cerr << "Caught CORBA::SystemException." << std::endl; + } + catch(CORBA::Exception&) + { + std::cerr << "Caught CORBA::Exception." << std::endl; + } + catch(omniORB::fatalException& fe) + { + std::cerr << "Caught omniORB::fatalException:" << std::endl; + std::cerr << " file: " << fe.file() << std::endl; + std::cerr << " line: " << fe.line() << std::endl; + std::cerr << " mesg: " << fe.errmsg() << std::endl; + } + catch(...) + { + std::cerr << "Caught unknown exception." << std::endl; + } + return 0; +} diff --git a/src/SALOMELocalTrace/Makefile.in b/src/Makefile.am similarity index 64% rename from src/SALOMELocalTrace/Makefile.in rename to src/Makefile.am index daf7c9d19..16c79ac9b 100644 --- a/src/SALOMELocalTrace/Makefile.in +++ b/src/Makefile.am @@ -1,5 +1,3 @@ -# 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 # @@ -22,35 +20,39 @@ # # # File : Makefile.in -# Author : Paul RASCLE (EDF) +# Author : Patrick GOLDBRONN (CEA) # Module : SALOME -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ +# $Header$ -# header files -EXPORT_HEADERS= utilities.h \ - LocalTraceBufferPool.hxx \ - BaseTraceCollector.hxx +SUBDIRS = \ + Basics \ + SALOMELocalTrace \ + CASCatch \ + HDFPersist -EXPORT_PYSCRIPTS = - -# Libraries targets - -LIB = libSALOMELocalTrace.la -LIB_SRC = BaseTraceCollector.cxx \ - LocalTraceCollector.cxx \ - FileTraceCollector.cxx \ - LocalTraceBufferPool.cxx - -LIBS= @LIBS@ -LDFLAGS+= -lSALOMEBasics +# EN COURS 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 -@CONCLUDE@ diff --git a/src/Makefile.in b/src/SALOMELocalTrace/Makefile.am similarity index 52% rename from src/Makefile.in rename to src/SALOMELocalTrace/Makefile.am index 2b5bb4c7d..019401f8b 100644 --- a/src/Makefile.in +++ b/src/SALOMELocalTrace/Makefile.am @@ -1,3 +1,5 @@ +# 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 # @@ -20,65 +22,21 @@ # # # File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) +# Author : Paul RASCLE (EDF) # 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 - -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 \ - LifeCycleCORBA/Test \ - UnitTests -endif - -@MODULE@ - +# $Header$ + +include $(top_srcdir)/salome_adm/unix/make_common_starter.am + +salomeinclude_HEADERS = utilities.h \ + LocalTraceBufferPool.hxx \ + BaseTraceCollector.hxx + +lib_LTLIBRARIES = libSALOMELocalTrace.la +libSALOMELocalTrace_la_SOURCES = BaseTraceCollector.cxx BaseTraceCollector.hxx \ + LocalTraceCollector.cxx \ + FileTraceCollector.cxx \ + LocalTraceBufferPool.cxx LocalTraceBufferPool.hxx +libSALOMELocalTrace_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSALOMELocalTrace_la_CPPFLAGS = -I$(srcdir)/../Basics +libSALOMELocalTrace_la_LIBADD = ../Basics/libSALOMEBasics.la -- 2.39.2