From 82decf21b02b9ab50c26308cd477078a92aeab3f Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 13 Apr 2007 14:53:27 +0000 Subject: [PATCH] Using AutoTools for build procedure --- AUTHORS | 0 COPYING | 504 ++++++++++++++++++ doc/Makefile.in => Makefile.am | 56 +- Makefile.in | 266 --------- NEWS | 0 README | 0 adm_local/Makefile.am | 19 + adm_local/unix/Makefile.am | 22 + adm_local/unix/config_files/Makefile.am | 23 + adm_local/unix/make_commence.in | 309 ----------- adm_local/unix/make_common_starter.am | 54 ++ adm_local/unix/make_conclude.in | 342 ------------ adm_local/unix/make_omniorb.in | 59 -- bin/Makefile.am | 36 ++ build_configure | 247 +++------ configure.ac | 455 ++++++++++++++++ adm_local/Makefile.in => doc/Makefile.am | 48 +- doc/salome/{Makefile.in => Makefile.am} | 46 +- doc/salome/gui/{Makefile.in => Makefile.am} | 20 +- doc/salome/tui/Makefile.am | 57 ++ doc/salome/tui/Makefile.in | 93 ---- idl/Makefile.am | 132 +++++ idl/Makefile.in | 93 ---- resources/Makefile.am | 173 ++++++ .../Makefile.in => Controls/Makefile.am} | 64 +-- src/Controls/Makefile.in | 52 -- src/Driver/{Makefile.in => Makefile.am} | 47 +- src/DriverDAT/Makefile.am | 79 +++ src/DriverMED/{Makefile.in => Makefile.am} | 66 ++- src/DriverSTL/Makefile.am | 74 +++ src/DriverUNV/{Makefile.in => Makefile.am} | 64 ++- src/MEFISTO2/{Makefile.in => Makefile.am} | 41 +- src/{Makefile.in => Makefile.am} | 34 +- src/OBJECT/Makefile.am | 74 +++ src/OBJECT/Makefile.in | 140 ----- src/SMDS/{Makefile.in => Makefile.am} | 100 ++-- src/SMESH/{Makefile.in => Makefile.am} | 82 +-- src/SMESHClient/Makefile.am | 80 +++ src/SMESHClient/Makefile.in | 103 ---- src/SMESHDS/{Makefile.in => Makefile.am} | 65 +-- .../Makefile.am} | 55 +- src/SMESHFiltersSelection/Makefile.in | 79 --- src/SMESHGUI/Makefile.am | 195 +++++++ src/SMESHGUI/Makefile.in | 203 ------- src/SMESH_I/{Makefile.in => Makefile.am} | 125 ++--- src/SMESH_SWIG/Makefile.am | 178 +++++++ src/SMESH_SWIG/Makefile.in | 124 ----- src/StdMeshers/{Makefile.in => Makefile.am} | 58 +- src/StdMeshersGUI/Makefile.am | 95 ++++ src/StdMeshersGUI/Makefile.in | 91 ---- src/StdMeshers_I/{Makefile.in => Makefile.am} | 67 +-- 51 files changed, 2759 insertions(+), 2730 deletions(-) create mode 100644 AUTHORS create mode 100644 COPYING rename doc/Makefile.in => Makefile.am (56%) delete mode 100644 Makefile.in create mode 100644 NEWS create mode 100644 README create mode 100644 adm_local/Makefile.am create mode 100644 adm_local/unix/Makefile.am create mode 100644 adm_local/unix/config_files/Makefile.am delete mode 100644 adm_local/unix/make_commence.in create mode 100644 adm_local/unix/make_common_starter.am delete mode 100644 adm_local/unix/make_conclude.in delete mode 100644 adm_local/unix/make_omniorb.in create mode 100644 bin/Makefile.am create mode 100644 configure.ac rename adm_local/Makefile.in => doc/Makefile.am (71%) rename doc/salome/{Makefile.in => Makefile.am} (53%) rename doc/salome/gui/{Makefile.in => Makefile.am} (81%) create mode 100644 doc/salome/tui/Makefile.am delete mode 100644 doc/salome/tui/Makefile.in create mode 100644 idl/Makefile.am delete mode 100644 idl/Makefile.in create mode 100644 resources/Makefile.am rename src/{DriverSTL/Makefile.in => Controls/Makefile.am} (55%) delete mode 100644 src/Controls/Makefile.in rename src/Driver/{Makefile.in => Makefile.am} (65%) create mode 100644 src/DriverDAT/Makefile.am rename src/DriverMED/{Makefile.in => Makefile.am} (54%) create mode 100644 src/DriverSTL/Makefile.am rename src/DriverUNV/{Makefile.in => Makefile.am} (57%) rename src/MEFISTO2/{Makefile.in => Makefile.am} (68%) rename src/{Makefile.in => Makefile.am} (73%) create mode 100644 src/OBJECT/Makefile.am delete mode 100644 src/OBJECT/Makefile.in rename src/SMDS/{Makefile.in => Makefile.am} (83%) rename src/SMESH/{Makefile.in => Makefile.am} (57%) create mode 100644 src/SMESHClient/Makefile.am delete mode 100644 src/SMESHClient/Makefile.in rename src/SMESHDS/{Makefile.in => Makefile.am} (76%) rename src/{DriverDAT/Makefile.in => SMESHFiltersSelection/Makefile.am} (52%) delete mode 100644 src/SMESHFiltersSelection/Makefile.in create mode 100644 src/SMESHGUI/Makefile.am delete mode 100644 src/SMESHGUI/Makefile.in rename src/SMESH_I/{Makefile.in => Makefile.am} (58%) create mode 100644 src/SMESH_SWIG/Makefile.am delete mode 100644 src/SMESH_SWIG/Makefile.in rename src/StdMeshers/{Makefile.in => Makefile.am} (81%) create mode 100644 src/StdMeshersGUI/Makefile.am delete mode 100644 src/StdMeshersGUI/Makefile.in rename src/StdMeshers_I/{Makefile.in => Makefile.am} (74%) 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..b1e3f5a26 --- /dev/null +++ b/COPYING @@ -0,0 +1,504 @@ + GNU LESSER GENERAL PUBLIC LICENSE + Version 2.1, February 1999 + + Copyright (C) 1991, 1999 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. + +[This is the first released version of the Lesser GPL. It also counts + as the successor of the GNU Library Public License, version 2, hence + the version number 2.1.] + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +Licenses are intended to guarantee your freedom to share and change +free software--to make sure the software is free for all its users. + + This license, the Lesser General Public License, applies to some +specially designated software packages--typically libraries--of the +Free Software Foundation and other authors who decide to use it. You +can use it too, but we suggest you first think carefully about whether +this license or the ordinary General Public License is the better +strategy to use in any particular case, based on the explanations below. + + When we speak of free software, we are referring to freedom of use, +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 and use pieces of +it in new free programs; and that you are informed that you can do +these things. + + To protect your rights, we need to make restrictions that forbid +distributors to deny you these rights or to ask you to surrender these +rights. These restrictions translate to certain responsibilities for +you if you distribute copies of the library or if you modify it. + + For example, if you distribute copies of the library, whether gratis +or for a fee, you must give the recipients all the rights that we gave +you. You must make sure that they, too, receive or can get the source +code. If you link other code with the library, you must provide +complete object files to the recipients, so that they can relink them +with the library after making changes to the library and recompiling +it. And you must show them these terms so they know their rights. + + We protect your rights with a two-step method: (1) we copyright the +library, and (2) we offer you this license, which gives you legal +permission to copy, distribute and/or modify the library. + + To protect each distributor, we want to make it very clear that +there is no warranty for the free library. Also, if the library is +modified by someone else and passed on, the recipients should know +that what they have is not the original version, so that the original +author's reputation will not be affected by problems that might be +introduced by others. + + Finally, software patents pose a constant threat to the existence of +any free program. We wish to make sure that a company cannot +effectively restrict the users of a free program by obtaining a +restrictive license from a patent holder. Therefore, we insist that +any patent license obtained for a version of the library must be +consistent with the full freedom of use specified in this license. + + Most GNU software, including some libraries, is covered by the +ordinary GNU General Public License. This license, the GNU Lesser +General Public License, applies to certain designated libraries, and +is quite different from the ordinary General Public License. We use +this license for certain libraries in order to permit linking those +libraries into non-free programs. + + When a program is linked with a library, whether statically or using +a shared library, the combination of the two is legally speaking a +combined work, a derivative of the original library. The ordinary +General Public License therefore permits such linking only if the +entire combination fits its criteria of freedom. The Lesser General +Public License permits more lax criteria for linking other code with +the library. + + We call this license the "Lesser" General Public License because it +does Less to protect the user's freedom than the ordinary General +Public License. It also provides other free software developers Less +of an advantage over competing non-free programs. These disadvantages +are the reason we use the ordinary General Public License for many +libraries. However, the Lesser license provides advantages in certain +special circumstances. + + For example, on rare occasions, there may be a special need to +encourage the widest possible use of a certain library, so that it becomes +a de-facto standard. To achieve this, non-free programs must be +allowed to use the library. A more frequent case is that a free +library does the same job as widely used non-free libraries. In this +case, there is little to gain by limiting the free library to free +software only, so we use the Lesser General Public License. + + In other cases, permission to use a particular library in non-free +programs enables a greater number of people to use a large body of +free software. For example, permission to use the GNU C Library in +non-free programs enables many more people to use the whole GNU +operating system, as well as its variant, the GNU/Linux operating +system. + + Although the Lesser General Public License is Less protective of the +users' freedom, it does ensure that the user of a program that is +linked with the Library has the freedom and the wherewithal to run +that program using a modified version of the Library. + + The precise terms and conditions for copying, distribution and +modification follow. Pay close attention to the difference between a +"work based on the library" and a "work that uses the library". The +former contains code derived from the library, whereas the latter must +be combined with the library in order to run. + + GNU LESSER GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License Agreement applies to any software library or other +program which contains a notice placed by the copyright holder or +other authorized party saying it may be distributed under the terms of +this Lesser General Public License (also called "this License"). +Each licensee is addressed as "you". + + A "library" means a collection of software functions and/or data +prepared so as to be conveniently linked with application programs +(which use some of those functions and data) to form executables. + + The "Library", below, refers to any such software library or work +which has been distributed under these terms. A "work based on the +Library" means either the Library or any derivative work under +copyright law: that is to say, a work containing the Library or a +portion of it, either verbatim or with modifications and/or translated +straightforwardly into another language. (Hereinafter, translation is +included without limitation in the term "modification".) + + "Source code" for a work means the preferred form of the work for +making modifications to it. For a library, 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 library. + + Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running a program using the Library is not restricted, and output from +such a program is covered only if its contents constitute a work based +on the Library (independent of the use of the Library in a tool for +writing it). Whether that is true depends on what the Library does +and what the program that uses the Library does. + + 1. You may copy and distribute verbatim copies of the Library's +complete 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 distribute a copy of this License along with the +Library. + + 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 Library or any portion +of it, thus forming a work based on the Library, 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) The modified work must itself be a software library. + + b) You must cause the files modified to carry prominent notices + stating that you changed the files and the date of any change. + + c) You must cause the whole of the work to be licensed at no + charge to all third parties under the terms of this License. + + d) If a facility in the modified Library refers to a function or a + table of data to be supplied by an application program that uses + the facility, other than as an argument passed when the facility + is invoked, then you must make a good faith effort to ensure that, + in the event an application does not supply such function or + table, the facility still operates, and performs whatever part of + its purpose remains meaningful. + + (For example, a function in a library to compute square roots has + a purpose that is entirely well-defined independent of the + application. Therefore, Subsection 2d requires that any + application-supplied function or table used by this function must + be optional: if the application does not supply it, the square + root function must still compute square roots.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Library, +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 Library, 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 Library. + +In addition, mere aggregation of another work not based on the Library +with the Library (or with a work based on the Library) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may opt to apply the terms of the ordinary GNU General Public +License instead of this License to a given copy of the Library. To do +this, you must alter all the notices that refer to this License, so +that they refer to the ordinary GNU General Public License, version 2, +instead of to this License. (If a newer version than version 2 of the +ordinary GNU General Public License has appeared, then you can specify +that version instead if you wish.) Do not make any other change in +these notices. + + Once this change is made in a given copy, it is irreversible for +that copy, so the ordinary GNU General Public License applies to all +subsequent copies and derivative works made from that copy. + + This option is useful when you wish to copy part of the code of +the Library into a program that is not a library. + + 4. You may copy and distribute the Library (or a portion or +derivative of it, under Section 2) in object code or executable form +under the terms of Sections 1 and 2 above provided that you 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. + + If distribution of 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 satisfies the requirement to +distribute the source code, even though third parties are not +compelled to copy the source along with the object code. + + 5. A program that contains no derivative of any portion of the +Library, but is designed to work with the Library by being compiled or +linked with it, is called a "work that uses the Library". Such a +work, in isolation, is not a derivative work of the Library, and +therefore falls outside the scope of this License. + + However, linking a "work that uses the Library" with the Library +creates an executable that is a derivative of the Library (because it +contains portions of the Library), rather than a "work that uses the +library". The executable is therefore covered by this License. +Section 6 states terms for distribution of such executables. + + When a "work that uses the Library" uses material from a header file +that is part of the Library, the object code for the work may be a +derivative work of the Library even though the source code is not. +Whether this is true is especially significant if the work can be +linked without the Library, or if the work is itself a library. The +threshold for this to be true is not precisely defined by law. + + If such an object file uses only numerical parameters, data +structure layouts and accessors, and small macros and small inline +functions (ten lines or less in length), then the use of the object +file is unrestricted, regardless of whether it is legally a derivative +work. (Executables containing this object code plus portions of the +Library will still fall under Section 6.) + + Otherwise, if the work is a derivative of the Library, you may +distribute the object code for the work under the terms of Section 6. +Any executables containing that work also fall under Section 6, +whether or not they are linked directly with the Library itself. + + 6. As an exception to the Sections above, you may also combine or +link a "work that uses the Library" with the Library to produce a +work containing portions of the Library, and distribute that work +under terms of your choice, provided that the terms permit +modification of the work for the customer's own use and reverse +engineering for debugging such modifications. + + You must give prominent notice with each copy of the work that the +Library is used in it and that the Library and its use are covered by +this License. You must supply a copy of this License. If the work +during execution displays copyright notices, you must include the +copyright notice for the Library among them, as well as a reference +directing the user to the copy of this License. Also, you must do one +of these things: + + a) Accompany the work with the complete corresponding + machine-readable source code for the Library including whatever + changes were used in the work (which must be distributed under + Sections 1 and 2 above); and, if the work is an executable linked + with the Library, with the complete machine-readable "work that + uses the Library", as object code and/or source code, so that the + user can modify the Library and then relink to produce a modified + executable containing the modified Library. (It is understood + that the user who changes the contents of definitions files in the + Library will not necessarily be able to recompile the application + to use the modified definitions.) + + b) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (1) uses at run time a + copy of the library already present on the user's computer system, + rather than copying library functions into the executable, and (2) + will operate properly with a modified version of the library, if + the user installs one, as long as the modified version is + interface-compatible with the version that the work was made with. + + c) Accompany the work with a written offer, valid for at + least three years, to give the same user the materials + specified in Subsection 6a, above, for a charge no more + than the cost of performing this distribution. + + d) If distribution of the work is made by offering access to copy + from a designated place, offer equivalent access to copy the above + specified materials from the same place. + + e) Verify that the user has already received a copy of these + materials or that you have already sent this user a copy. + + For an executable, the required form of the "work that uses the +Library" must include any data and utility programs needed for +reproducing the executable from it. However, as a special exception, +the materials to be 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. + + It may happen that this requirement contradicts the license +restrictions of other proprietary libraries that do not normally +accompany the operating system. Such a contradiction means you cannot +use both them and the Library together in an executable that you +distribute. + + 7. You may place library facilities that are a work based on the +Library side-by-side in a single library together with other library +facilities not covered by this License, and distribute such a combined +library, provided that the separate distribution of the work based on +the Library and of the other library facilities is otherwise +permitted, and provided that you do these two things: + + a) Accompany the combined library with a copy of the same work + based on the Library, uncombined with any other library + facilities. This must be distributed under the terms of the + Sections above. + + b) Give prominent notice with the combined library of the fact + that part of it is a work based on the Library, and explaining + where to find the accompanying uncombined form of the same work. + + 8. You may not copy, modify, sublicense, link with, or distribute +the Library except as expressly provided under this License. Any +attempt otherwise to copy, modify, sublicense, link with, or +distribute the Library 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. + + 9. 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 Library or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Library (or any work based on the +Library), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Library or works based on it. + + 10. Each time you redistribute the Library (or any work based on the +Library), the recipient automatically receives a license from the +original licensor to copy, distribute, link with or modify the Library +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 with +this License. + + 11. 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 Library at all. For example, if a patent +license would not permit royalty-free redistribution of the Library 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 Library. + +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. + + 12. If the distribution and/or use of the Library is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Library 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. + + 13. The Free Software Foundation may publish revised and/or new +versions of the Lesser 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 Library +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 Library does not specify a +license version number, you may choose any version ever published by +the Free Software Foundation. + + 14. If you wish to incorporate parts of the Library into other free +programs whose distribution conditions are incompatible with these, +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 + + 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO +WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. +EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR +OTHER PARTIES PROVIDE THE LIBRARY "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 +LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME +THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. 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 LIBRARY 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 +LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), 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 Libraries + + If you develop a new library, and you want it to be of the greatest +possible use to the public, we recommend making it free software that +everyone can redistribute and change. You can do so by permitting +redistribution under these terms (or, alternatively, under the terms of the +ordinary General Public License). + + To apply these terms, attach the following notices to the library. 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 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, or (at your option) any later version. + + 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 + +Also add information on how to contact you by electronic and paper mail. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the library, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the + library `Frob' (a library for tweaking knobs) written by James Random Hacker. + + , 1 April 1990 + Ty Coon, President of Vice + +That's all there is to it! + + diff --git a/doc/Makefile.in b/Makefile.am similarity index 56% rename from doc/Makefile.in rename to Makefile.am index af9e2aae5..abe560f09 100644 --- a/doc/Makefile.in +++ b/Makefile.am @@ -17,54 +17,36 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - # -* Makefile *- # # Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 +# Date : 28/06/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage # $Header$ # -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ -SUBDIRS= salome +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +SUBDIRS = idl adm_local resources src doc bin -docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +DIST_SUBDIRS = idl adm_local resources src doc bin -usr_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +DISTCLEANFILES = a.out aclocal.m4 configure -dev_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +salomeinclude_DATA=SMESH_version.h -clean: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +EXTRA_DIST+= \ + build_configure \ + clean_configure \ + LICENCE -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +dist-hook: + rm -rf `find $(distdir) -name CVS` -install: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +usr_docs: + (cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs) + +docs:usr_docs -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done +dev_docs: + (cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs) diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index f5cf75a21..000000000 --- a/Makefile.in +++ /dev/null @@ -1,266 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -* 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:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl - - -@COMMENCE@ - -SUBDIRS = idl src doc adm_local - -RESOURCES_FILES = \ -delete.png \ -mesh_add_sub.png \ -mesh_algo_hexa.png \ -mesh_algo_mefisto.png \ -mesh_algo_quad.png \ -mesh_algo_regular.png \ -mesh_algo_tetra.png \ -mesh_angle.png \ -mesh_area.png \ -mesh_aspect.png \ -mesh_aspect_3d.png \ -mesh_compute.png \ -mesh_connectivity.png \ -mesh_diagonal.png \ -mesh_edit.png \ -mesh_hexa_n.png \ -mesh_hexa.png \ -mesh_hypo_area.png \ -mesh_hypo_length.png \ -mesh_hypo_segment.png \ -mesh_hypo_volume.png \ -mesh_hypo_edit.png \ -mesh_info.png \ -advanced_mesh_info.png \ -standard_mesh_info.png \ -mesh_init.png \ -mesh_length.png \ -mesh_length_2d.png \ -mesh_free_edges.png \ -mesh_free_edges_2d.png \ -mesh_multi_edges.png \ -mesh_multi_edges_2d.png \ -mesh_line_n.png \ -mesh_line.png \ -mesh_move_node.png \ -mesh_orientation.png \ -mesh.png \ -mesh_polygon.png \ -mesh_polyhedron.png \ -mesh_pyramid_n.png \ -mesh_pyramid.png \ -mesh_quad_n.png \ -mesh_quad.png \ -mesh_rem_element.png \ -mesh_rem_node.png \ -mesh_set_algo.png \ -mesh_set_hypo.png \ -mesh_shading.png \ -mesh_shrink.png \ -mesh_skew.png \ -mesh_taper.png \ -mesh_tetra_n.png \ -mesh_tetra.png \ -mesh_tree_algo_hexa.png \ -mesh_tree_algo_mefisto.png \ -mesh_tree_algo.png \ -mesh_tree_algo_quad.png \ -mesh_tree_algo_regular.png \ -mesh_tree_algo_tetra.png \ -mesh_tree_algo_netgen_2d3d.png \ -mesh_tree_algo_netgen_2d.png \ -mesh_tree_hypo_area.png \ -mesh_tree_hypo_length.png \ -mesh_tree_hypo.png \ -mesh_tree_hypo_segment.png \ -mesh_tree_hypo_volume.png \ -mesh_tree_hypo_netgen.png \ -mesh_tree_hypo_netgen_2d.png \ -mesh_tree_mesh.png \ -mesh_tree_importedmesh.png \ -mesh_tree_mesh_warn.png \ -mesh_triangle_n.png \ -mesh_triangle.png \ -mesh_update.png \ -mesh_vertex_n.png \ -mesh_vertex.png \ -mesh_volume_3d.png \ -mesh_wireframe.png \ -mesh_points.png \ -mesh_wrap.png \ -mesh_tree_group.png \ -mesh_edit_group.png \ -mesh_make_group.png \ -mesh_union2tri.png \ -mesh_uniontri.png \ -mesh_cutquad.png \ -mesh_smoothing.png \ -mesh_renumbering_nodes.png \ -mesh_renumbering_elements.png \ -mesh_extrusion.png \ -mesh_extrusionpath.png \ -mesh_revolution.png \ -ModuleMesh.png \ -mesh_unionGroups.png \ -mesh_intersectGroups.png \ -mesh_cutGroups.png \ -mesh_deleteGroups.png \ -mesh_translation_vector.png \ -mesh_translation_points.png \ -mesh_rotation.png \ -mesh_symmetry_point.png \ -mesh_symmetry_axis.png \ -mesh_symmetry_plane.png \ -mesh_sew_freeborders.png \ -mesh_sew_conform_freeborders.png \ -mesh_sew_bordertoside.png \ -mesh_sew_sideelements.png \ -mesh_merge_nodes.png \ -mesh_merge_elements.png \ -select1.png \ -SMESH_en.xml \ -SMESH.config \ -StdMeshers.xml \ -SMESHCatalog.xml \ -SalomeApp.xml \ -mesh_pattern.png \ -pattern_sample_2d.png \ -pattern_sample_3D.png \ -mesh_add.png \ -mesh_remove.png \ -mesh_quad_edge.png \ -mesh_quad_triangle.png \ -mesh_quad_quadrangle.png \ -mesh_quad_tetrahedron.png \ -mesh_quad_pyramid.png \ -mesh_quad_pentahedron.png \ -mesh_quad_hexahedron.png \ -mesh_conv_to_quad.png \ -mesh_tree_hypo_layers_distribution.png \ -mesh_tree_algo_radial_prism.png \ -mesh_tree_algo_projection_3d.png \ -mesh_tree_algo_projection_2d.png \ -mesh_hypo_source_edge.png \ -mesh_hypo_source_3d.png \ -mesh_hypo_layer_distribution.png \ -mesh_hypo_source_face.png \ -mesh_tree_hypo_source_face.png \ -mesh_tree_hypo_source_edge.png \ -mesh_tree_hypo_source_3d_shape.png \ -mesh_tree_hypo_projection_3d.png \ -mesh_tree_hypo_projection_2d.png \ - -BIN_SCRIPT= \ -VERSION - -# copy header files in common directory - -include_list = include/salome/SALOMEconfig.h \ - include/salome/SMESH_version.h - -ifneq ($(HAVE_SSTREAM),yes) - include_list += include/salome/sstream -endif - -inc: idl $(include_list) - -bin: bin/salome/VERSION - -bin/salome/VERSION : bin/VERSION - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref - -$(RM) $@ - $(LN_S) ../../$< $@ - -# test if SALOMEconfig.h has changed (contents) -salome_adm/unix/SALOMEconfig.ref: salome_adm/unix/SALOMEconfig.h - @if ! [ -a $@ ]; then \ - cp -p -f $< $@; \ - fi; \ - if ! cmp $< $@; then \ - cp -p -f $< $@; \ - fi; \ - -include/salome/sstream: salome_adm/unix/sstream - -$(RM) $@ - $(LN_S) ../../$< $@ - -include/salome/SMESH_version.h: SMESH_version.h - -$(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-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 \ - ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ - fi; \ - done - -# install script in $(bindir) : -install-bin: $(BIN_SCRIPT) - $(INSTALL) -d $(bindir) - if test $(BIN_SCRIPT)X != X; then \ - $(INSTALL_PROGRAM) $^ $(bindir); \ - fi - -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 - -$(RM) config.cache config.log config.status - -@MODULE@ - -install: install-bin install-include install-end - diff --git a/NEWS b/NEWS new file mode 100644 index 000000000..e69de29bb diff --git a/README b/README new file mode 100644 index 000000000..e69de29bb diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am new file mode 100644 index 000000000..7ae83a6fc --- /dev/null +++ b/adm_local/Makefile.am @@ -0,0 +1,19 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +SUBDIRS = unix diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am new file mode 100644 index 000000000..facd4e6f4 --- /dev/null +++ b/adm_local/unix/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = config_files diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am new file mode 100644 index 000000000..3198e9da1 --- /dev/null +++ b/adm_local/unix/config_files/Makefile.am @@ -0,0 +1,23 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocalm4_DATA = \ + check_SMESH.m4 \ + check_f77.m4 diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in deleted file mode 100644 index 0be66a96f..000000000 --- a/adm_local/unix/make_commence.in +++ /dev/null @@ -1,309 +0,0 @@ -# common directories to put headerfiles -inc_builddir=$(top_builddir)/include/salome - -MODULE_NAME=@MODULE_NAME@ - -@SET_MAKE@ -SHELL=/bin/sh - -# header missing - -HAVE_SSTREAM=@HAVE_SSTREAM@ - - -LIBS=@LIBS@ -LIBSFORBIN=@LIBS@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker -LDFLAGSFORBIN=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker -# add libstdc++ to link c++ library with libtool ! -LDFLAGS+= -lstdc++ -LDFLAGSFORBIN+= -lstdc++ - -CP=@CP@ - -# CPP - -CPP=@CPP@ -CXXCPP=@CXXCPP@ -CPPFLAGS=@CPPFLAGS@ -I$(inc_builddir) -I$(srcdir) -I. - -# C - -CC = @CC@ -CFLAGS = @CFLAGS@ -C_DEPEND_FLAG = @C_DEPEND_FLAG@ - -# C++ - -CXX = @CXX@ -CXXFLAGS = @CXXFLAGS@ -CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ - -# BOOST Library - -BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ - -# JAVA - -JAVA_INCLUDES = @JAVA_INCLUDES@ -JAVA_LIBS = @JAVA_LIBS@ -JAVA_LDPATH = @JAVA_LDPATH@ - -# PYTHON - -PYTHON = @PYTHON@ -PYTHONHOME = @PYTHONHOME@ -PYTHON_INCLUDES = @PYTHON_INCLUDES@ -PYTHON_LIBS = @PYTHON_LIBS@ -PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages -PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome - -# QT - -QT_ROOT = @QT_ROOT@ -QT_INCLUDES = @QT_INCLUDES@ -QT_MT_INCLUDES = @QT_INCLUDES@ -DQT_THREAD_SUPPORT -QT_LIBS = @QT_LIBS@ -QT_MT_LIBS = @QT_MT_LIBS@ - -MOC = @MOC@ -UIC = @UIC@ -MSG2QM = @MSG2QM@ - -#QWT - -QWT_INCLUDES=@QWT_INCLUDES@ -QWT_LIBS=@QWT_LIBS@ - -# SIP -SIP = @SIP@ -SIP_INCLUDES = @SIP_INCLUDES@ -SIP_LIBS = @SIP_LIBS@ - -# PYQT -PYQT_SIPS = @PYQT_SIPS@ -PYQT_LIBS = @PYQT_LIBS@ - -# openGL -OGL_INCLUDES=@OGL_INCLUDES@ -OGL_LIBS=@OGL_LIBS@ - -# VTK -VTK_INCLUDES=@VTK_INCLUDES@ -VTK_LIBS=@VTK_LIBS@ - -# HDF5 - -HDF5_INCLUDES=@HDF5_INCLUDES@ -HDF5_LIBS=@HDF5_LIBS@ -HDF5_MT_LIBS=@HDF5_MT_LIBS@ - -# OpenCasCade - -OCC_INCLUDES=@CAS_CPPFLAGS@ -OCC_CXXFLAGS=@CAS_CXXFLAGS@ - -OCC_KERNEL_LIBS=@CAS_KERNEL@ -OCC_OCAF_LIBS=@CAS_OCAF@ -OCC_VIEWER_LIBS=@CAS_VIEWER@ -OCC_MODELER_LIBS=@CAS_MODELER@ -OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ -OCC_LIBS=@CAS_LDFLAGS@ -OCC_LDPATH=@CAS_LDPATH@ - -# MPICH - -MPICH_INCLUDES=@MPICH_INCLUDES@ -MPICH_LIBS=@MPICH_LIBS@ - -# Swig C++ Python - -SWIG = @SWIG@ -SWIG_FLAGS = @SWIG_FLAGS@ -I$(inc_builddir) -I$(srcdir) -I. - -# OMNIORB - -OMNIORB_ROOT = @OMNIORB_ROOT@ -OMNIORB_INCLUDES = @OMNIORB_INCLUDES@ -OMNIORB_LIBS = @OMNIORB_LIBS@ -OMNIORB_CXXFLAGS = @OMNIORB_CXXFLAGS@ - -OMNIORB_IDL = @OMNIORB_IDL@ -OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ -OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome - -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@ - -# Default ORB - -CORBA_ROOT = @CORBA_ROOT@ -CORBA_INCLUDES = @CORBA_INCLUDES@ -CORBA_LIBS = @CORBA_LIBS@ -CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ - -IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ - -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -IDLPYFLAGS = @IDLPYFLAGS@ - -IDL = @IDL@ - -IDL_CLN_H = @IDL_CLN_H@ -IDL_CLN_CXX = @IDL_CLN_CXX@ -IDL_CLN_OBJ = @IDL_CLN_OBJ@ - -IDL_SRV_H = @IDL_SRV_H@ -IDL_SRV_CXX = @IDL_SRV_CXX@ -IDL_SRV_OBJ = @IDL_SRV_OBJ@ - -CPPFLAGS+= $(CORBA_INCLUDES) -CXXFLAGS+= $(CORBA_CXXFLAGS) - -# add corba libs when link salome application ! -#LDFLAGS+= $(CORBA_LIBS) -LIBS+=$(CORBA_LIBS) - -DOXYGEN = @DOXYGEN@ -DOXYGEN_WITH_PYTHON = @DOXYGEN_WITH_PYTHON@ -DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ - -## Shared libraries -LT_STATIC_EXEC=@LT_STATIC_EXEC@ -DYNAMIC_DIRS=@DYNAMIC_DIRS@ -LT_LIB=libtool -LT=$(top_builddir)/libtool -LT_COMPILE=$(LT) --mode=compile $(CC) -LT_LINK_LIB=$(LT_LIB) --mode=link $(CC) -rpath $(libdir) -LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS) -LT_RUN=$(LT) --mode=execute -LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM) -LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA) -LT_UNINSTALL=$(LT) --mode=uninstall $(RM) - -INSTALL=@INSTALL@ -INSTALL_PROGRAM=@INSTALL_PROGRAM@ -INSTALL_DATA=@INSTALL_DATA@ - -# create a symbolic link (or a copie ?) -LN_S=@LN_S@ - -KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ -KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ -KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ -KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ - -GUI_ROOT_DIR=@GUI_ROOT_DIR@ -GUI_LDFLAGS=@GUI_LDFLAGS@ -GUI_CXXFLAGS=@GUI_CXXFLAGS@ - -MED_ROOT_DIR=@MED_ROOT_DIR@ -MED_LDFLAGS=@MED_LDFLAGS@ -MED_CXXFLAGS=@MED_CXXFLAGS@ - -GEOM_ROOT_DIR=@GEOM_ROOT_DIR@ -GEOM_LDFLAGS=@GEOM_LDFLAGS@ -GEOM_CXXFLAGS=@GEOM_CXXFLAGS@ - -## Installation points -prefix=@prefix@ -exec_prefix=@exec_prefix@ -bindir=@exec_prefix@/bin/salome -libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome -# warning : if user give this path in configure we could have salome/salome :-( -includedir=@includedir@/salome -datadir=@datadir@/salome -idldir=$(prefix)/idl/salome -sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules - -docdir=${prefix}/doc/salome - -# -# begin of package rules -# - -.PHONY: all lib bin inc resources docs tests install uninstall dep depend depend_idl cleandep mostlyclean clean distclean - -.SUFFIXES: .cxx .cc .c .f .o .lo .idl .py .i .ui .po .qm - -all: - $(MAKE) inc - $(MAKE) depend_idl - $(MAKE) depend - $(MAKE) lib - $(MAKE) bin - $(MAKE) resources - -# -# add target to build administrative files -# - -Makefile: $(top_builddir)/config.status $(srcdir)/Makefile.in - cd $(top_builddir) ; ./config.status - -LOCAL_MAKE = make_commence make_conclude make_omniorb - -KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript - -$(top_builddir)/config.status: $(top_srcdir)/configure \ - $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ - $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) - cd $(top_builddir) ; ./config.status --recheck - -# VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) -ifneq ($(top_srcdir),$(srcdir)) -configure: $(top_srcdir)/configure -endif - -$(top_srcdir)/configure: $(top_srcdir)/configure.in $(top_srcdir)/aclocal.m4 - cd $(top_srcdir) ; autoconf - -$(top_srcdir)/configure.in: $(top_srcdir)/configure.in.base - cd $(top_srcdir) && ./build_configure - - -ACLOCAL_KERNEL = \ - ac_cxx_bool.m4 \ - check_corba.m4 \ - ac_cxx_depend_flag.m4 \ - check_hdf5.m4 \ - enable_pthreads.m4 \ - ac_cxx_mutable.m4 \ - check_mico.m4 \ - ac_cxx_namespaces.m4 \ - check_omniorb.m4 \ - pyembed.m4 \ - ac_cxx_partial_specialization.m4 \ - python.m4 \ - ac_cxx_typename.m4 \ - check_pthreads.m4 \ - check_cas.m4 \ - ac_cc_warnings.m4 \ - check_boost.m4 \ - check_swig.m4 - -ACLOCAL_GUI = \ - check_vtk.m4 \ - check_opengl.m4 \ - check_qt.m4 \ - check_GUI.m4 \ - check_corba_in_GUI.m4 - -ACLOCAL_MED = check_Med.m4 -ACLOCAL_GEOM = check_GEOM.m4 - -$(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ - $(ACLOCAL_GUI:%=@GUI_ROOT_DIR@/adm_local/unix/config_files/%) \ - $(ACLOCAL_MED:%=@MED_ROOT_DIR@/adm_local/unix/config_files/%) \ - $(ACLOCAL_GEOM:%=@GEOM_ROOT_DIR@/adm_local/unix/config_files/%) - cd $(top_srcdir) ; aclocal -I adm_local/unix/config_files -I @KERNEL_ROOT_DIR@/salome_adm/unix/config_files \ - -I @GUI_ROOT_DIR@/adm_local/unix/config_files \ - -I @MED_ROOT_DIR@/adm_local/unix/config_files \ - -I @GEOM_ROOT_DIR@/adm_local/unix/config_files - diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am new file mode 100644 index 000000000..533941331 --- /dev/null +++ b/adm_local/unix/make_common_starter.am @@ -0,0 +1,54 @@ +# +# ============================================================ +# This file defines the common definitions used in several +# Makefile. This file must be included, if needed, by the file +# Makefile.am. +# ============================================================ +# + +# Standard directory for installation +salomeincludedir = $(includedir)/@PACKAGE@ +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ +bindir = $(prefix)/bin/@PACKAGE@ +salomescriptdir = $(bindir) + +# Directory for installing idl files +salomeidldir = $(prefix)/idl/@PACKAGE@ + +# Directory for installing resource files +salomeresdir = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@ + +# Directories for installing admin files +admlocaldir = $(prefix)/adm_local +admlocalunixdir = $(admlocaldir)/unix +admlocalm4dir = $(admlocaldir)/unix/config_files + +# Shared modules installation directory +sharedpkgpythondir =$(pkgpythondir)/shared_modules + +# Documentation directory +docdir = $(datadir)/doc/@PACKAGE@ + +# common rules + +# moc-files generation +%_moc.cxx: %.h + $(MOC) $< -o $@ + +# qm-files generation +%.qm: %.po + $(MSG2QM) $< $@ + +EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(nodist_salomeres_DATA:%.qm=%.po) + +mostlyclean-local: + rm -f @builddir@/*_moc.cxx + rm -f @builddir@/*.qm + +# tests +tests: unittest + +unittest: $(UNIT_TEST_PROG) + @if test "x$(UNIT_TEST_PROG)" != "x"; then \ + $(UNIT_TEST_PROG); \ + fi; diff --git a/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in deleted file mode 100644 index 554b8afb0..000000000 --- a/adm_local/unix/make_conclude.in +++ /dev/null @@ -1,342 +0,0 @@ -#======================================================================= -# This section of this makefile comes from the file -# 'adm/unix/make_conclude' which was generated with config.status -# from file adm/unix/make_conclude.in -#======================================================================= -# -* Makefile *- -# -# Authors : Patrick GOLDBRONN (CEA) - Marc Tajchman (CEA) -# Date : 6/07/2001 -# $Header$ -# - -# ORB Specifics rules -@CORBA@ - -# transform idl reference in appropriate obj file -LIB_CLIENT_SRC = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) -LIB_SERVER_SRC = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) -LIB_MOC_SRC = $(LIB_MOC:%.h=%_moc.cxx) -LIB_SRC+=$(LIB_MOC_SRC) -LIB_SWIG_SRC = $(SWIG_DEF:%.i=%_wrap.cxx) -LIB_DEP= $(LIB_SRC) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(LIB_SWIG_SRC) - -LIB_CLIENT_OBJ = $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) -LIB_SERVER_OBJ = $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) - - -# transform c file in appropriate libtool obj file (.c, .cc and .cxx) -LIB_OBJ_C = $(patsubst %.c, %.lo, $(filter %.c, $(LIB_SRC))) -LIB_OBJ_CC = $(patsubst %.cc, %.lo, $(filter %.cc, $(LIB_SRC))) -LIB_OBJ_CXX = $(patsubst %.cxx, %.lo, $(filter %.cxx, $(LIB_SRC))) -LIB_SWIG_OBJ = $(LIB_SWIG_SRC:%.cxx=%.lo) -LIB_OBJ_F = $(patsubst %.f, %.lo, $(filter %.f, $(LIB_SRC))) - -# all libtool obj file in library -LIB_OBJ = $(LIB_OBJ_CXX) $(LIB_OBJ_CC) $(LIB_OBJ_C) $(LIB_CLIENT_OBJ:%.o=%.lo) $(LIB_SERVER_OBJ:%.o=%.lo) $(LIB_SWIG_OBJ) $(LIB_OBJ_F) - -# LIB_BUILD = $(LIB:%.la=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la) -LIB_BUILD = $(patsubst %.la, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la, $(filter %.la, $(LIB))) -LIB_BUILD_A = $(patsubst %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a, $(filter %.a, $(LIB))) - -ifneq ($(findstring cmodule.la,$(filter %.la, $(LIB))),) -LIB_SWIG = $(patsubst %cmodule.la,%.so, $(filter %.la, $(LIB))) -else -LIB_SWIG = -endif - -lib: $(LIB_BUILD) $(LIB_CLIENT_PY) -# we don't build static library ! - -$(LIB_BUILD): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.la: %.la - -$(RM) $@ - -$(RM) $(patsubst %.la, %.so, $@) - -$(RM) $(patsubst %.la, %.a, $@) - ln -sf $(CURDIR)/$< $@ || true - ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<) \ - $(patsubst %.la, %.so, $@) || true - ln -sf $(patsubst %.la, %.so, $(CURDIR)/.libs/$<).0 \ - $(patsubst %.la, %.so, $@).0 || true - - if ! test -z $(LIB_SWIG) ; then \ - ln -sf $(patsubst %.la,%.so, $(CURDIR)/.libs/$<) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/_$(LIB_SWIG) || true;\ - fi; - -$(LIB_BUILD_A): $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/%.a: %.a - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ || true - -$(LIB): $(LIB_OBJ) - @$(LT) --mode=link $(CXX) -rpath $(libdir) -o $@ $(CXXFLAGS) $(LIB_OBJ) $(LDFLAGS) $(LIBS) - -# transform idl reference in appropriate obj file -BIN_CLIENT_SRC = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_CXX)) -BIN_SERVER_SRC = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_CXX)) -BIN_MOC_SRC = $(BIN_MOC:%.h=%_moc.cxx) -BIN_SRC+=$(BIN_MOC_SRC) -BIN_DEP=$(BIN:%=%.cxx) $(BIN_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) - -BIN_CLIENT_OBJ = $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_OBJ)) -BIN_SERVER_OBJ = $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_OBJ)) -# transform c file in appropriate libtool obj file (.c) -BIN_OBJ_C = $(patsubst %.c, %.o, $(filter %.c, $(BIN_SRC))) -# transform c++ file in appropriate libtool obj file (.cc and .cxx) -BIN_OBJ_CC = $(patsubst %.cc, %.o, $(filter %.cc, $(BIN_SRC))) -BIN_OBJ_CXX = $(patsubst %.cxx, %.o, $(filter %.cxx, $(BIN_SRC))) -# all obj file in bin target -BIN_OBJ = $(BIN_OBJ_CC) $(BIN_OBJ_CXX) $(BIN_OBJ_C) $(BIN_CLIENT_OBJ) $(BIN_SERVER_OBJ) - -bin: $(BIN:%=$(top_builddir)/bin/salome/%) $(BIN) $(LIB) pyscripts sharedpyscripts - -BIN_LIB=$(LIB:lib%.la=-l%) - -$(BIN:%=$(top_builddir)/bin/salome/%) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%): $(top_builddir)/bin/salome/%: % - -$(RM) $@ - ln -sf $(CURDIR)/$< $@ - -$(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) - $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) - -# copy python scripts in $(top_builddir)/bin/salome -# -DEST_PYSCRIPTS = $(EXPORT_PYSCRIPTS:%=$(top_builddir)/bin/salome/%) -pyscripts: $(DEST_PYSCRIPTS) -$(DEST_PYSCRIPTS): $(top_builddir)/bin/salome/%: % - cp -f $< $@ - -# copy pyqt files in $(PYTHON_SHARED_SITE) -# -PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules - -$(PYTHON_SHARED_SITE): - $(INSTALL) -d $@ - -DEST_SHAREDPYSCRIPTS = $(EXPORT_SHAREDPYSCRIPTS:%=$(PYTHON_SHARED_SITE)/%) -sharedpyscripts: $(PYTHON_SHARED_SITE) $(DEST_SHAREDPYSCRIPTS) -$(DEST_SHAREDPYSCRIPTS): $(PYTHON_SHARED_SITE)/%: % - cp -f $< $@ - -check: test - -tests: test - -test: $(LIB) $(TEST_PROGS:%=$(top_builddir)/bin/salome/%) - - -# copy header file in $(inc_builddir) -# -DEST_HEADERS = $(EXPORT_HEADERS:%=$(inc_builddir)/%) -inc: $(DEST_HEADERS) -$(DEST_HEADERS): $(inc_builddir)/%: % - cp -f $< $@ - -# build resources file (icons and messages) : .qm file from .po file -resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) - -# Make installation directories if they don't exist. -$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): - $(INSTALL) -d $@ && chmod 755 $@ - -# Install the library, the public header files, and programs. -install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm - @for f in X $(LIB); do \ - if test $$f != X; then \ - ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ - fi; \ - done - @if ! test -z $(LIB_SWIG) ; then \ - (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ - fi; - @for f in X $(BIN); do \ - if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ - fi; \ - done -# Install tests programmes in bindir - @for f in X $(TEST_PROGS); do \ - if test $$f != X; then \ - ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ - fi; \ - done -# Install exported includes in includedir - @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ - if test $$f != X; then \ - (cp -p -f $$f $(includedir) || exit 1); \ - fi; \ - done - -# Install python script in $(bindir) -install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) - -$(EXPORT_PYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(bindir)/. - -#install-python: $(bindir) $(EXPORT_PYSCRIPTS) -# @for f in X $(EXPORT_PYSCRIPTS); do \ -# if test $$f != X; then \ -# ($(INSTALL_PROGRAM) $$f $(bindir)/. || exit 1); \ -# fi; \ -# done - -# Install pyqt script in $(install-sharedpyqt) -install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) - -$(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % - $(INSTALL_PROGRAM) $< $(sharedpydir)/. - - -# generic rule to install .qm files : -install-qm: resources - $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) - @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ - if test $$f != X; then \ - ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ - fi; \ - done - -# Removes those things that `make install' (would have) installed. -uninstall: - @if test "X$(LIB)" != X; then \ - for f in $(LIB); do \ - $(LT_UNINSTALL) $(libdir)/$$f; \ - done; \ - fi - @if test "X$(BIN)" != X; then \ - for f in $(BIN); do \ - $(LT_UNINSTALL) $(bindir)/$$f; \ - done; \ - fi - @for f in X $(TEST_PROGS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f; \ - fi; \ - done -# Uninstall exported includes in includedir - @for f in X $(EXPORT_HEADERS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(includedir)/$$f; \ - fi; \ - done -# Uninstall python script in $(bindir) - @for f in X $(EXPORT_PYSCRIPTS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(bindir)/$$f ; \ - fi; \ - done - -# Uninstall pyqt script in $(sharedpydir) - @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ - fi; \ - done - -# Uninstall qm files - @for f in X $(PO_FILES:%.po=%.qm); do \ - if test $$f != X; then \ - $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ - fi; \ - done - -# remove all dependencies files -# -cleandep: - -$(RM) .dep* - -# Removes temporary files without removing the final target files. That is, -# remove things like object files but not libraries or executables. -# -mostlyclean: cleandep - -$(RM) $(LIB_OBJ) $(LIB_OBJ:.lo=.o) - -$(RM) $(BIN_OBJ) $(BIN:%=%.o) - -$(RM) $(TEST_OBJ) $(TEST_OBJ:.lo=.o) - -$(RM) $(PROG_OBJ) $(PROG_OBJ:.lo=.o) $(MOSTLYCLEAN) - -# Like `mostlyclean' except it also removes the final targets: things like -# libraries and executables. This target doesn't remove any file that -# is part of the SALOME distribution. -# -clean: mostlyclean - -$(RM) $(LIB) $(TEST_PROGS) $(BIN) $(CLEAN) - -$(RM) TAGS *~ *# core *.core - -$(RM) -r .libs - -$(RM) $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB) - -$(RM) $(patsubst %,$(top_builddir)/bin/salome/%, $(BIN)) - -$(RM) $(patsubst %.la, %.so, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)) - -$(RM) $(patsubst %.la, %.a, $(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome/$(LIB)) -# remove idl generated files (sources) - -$(RM) $(LIB_CLIENT_SRC) $(LIB_SERVER_SRC) $(BIN_CLIENT_SRC) $(BIN_SERVER_SRC) -# remove idl generated files (headers) - -$(RM) $(LIB_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(LIB_SERVER_IDL:%.idl=%$(IDL_SRV_H)) - -$(RM) $(BIN_CLIENT_IDL:%.idl=%$(IDL_CLN_H)) $(BIN_SERVER_IDL:%.idl=%$(IDL_SRV_H)) - -$(RM) $(LIB_MOC_SRC) $(BIN_MOC_SRC) - -$(RM) $(LIB_SWIG_SRC) - -# Like `clean' except it also removes files that were created by running -# configure. If you've unpacked the source and built without creating -# any other files, then `make distclean' will leave only the files that were -# in the distribution. -# -distclean: clean - #remove qm file ! - -$(RM) $(PO_FILES:%.po=%.qm) $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) - #remove include files - -$(RM) $(DEST_HEADERS) - -$(RM) $(DISTCLEAN) *.bak *.old *.new .dep* - @if test -f $(srcdir)/Makefile.in; then \ - (@SETX@; $(RM) Makefile); \ - fi - - -#implicits rules -.cc.o: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cc.lo: - $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cxx.o: - $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.cxx.lo: - $(LT) --mode=compile $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $< - -.c.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $< - -.c.lo: - $(LT_COMPILE) $(CFLAGS) $(CPPFLAGS) -c $< - -.f.o: - $(FC) $(FFLAGS) -c $< -o $@ - -.f.lo: - $(LT) --mode=compile $(FC) $(FFLAGS) -c $< - -.ui.h: - $(UIC) -o $@ $< - -.ui.cxx: - $(UIC) -o $@ -i $*.h $< - -#pattern rules -%_moc.cxx : %.h - $(MOC) $< -o $@ - -%_wrap.cxx : %.i - $(SWIG) $(SWIG_FLAGS) -o $@ $< - -$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm: %.po - $(MSG2QM) $< $@ ; \ - -#------------------------------------------------------------------------------ -# The following section of this makefile contains dependencies between the -# source files and the header files. If GNU make and GCC are being used then -# the dependencies are in the form of rules that cause the information to -# be kept updated automatically. Otherwise the dependencies are listed -# explicitly and come from the `.distdep' files in the various directories. -# These files are part of the distribution and are generated automatically on -# GNU/GCC systems. -#------------------------------------------------------------------------------ - -@DEPEND@ diff --git a/adm_local/unix/make_omniorb.in b/adm_local/unix/make_omniorb.in deleted file mode 100644 index 1299082fa..000000000 --- a/adm_local/unix/make_omniorb.in +++ /dev/null @@ -1,59 +0,0 @@ -#======================================================================= -# Begin specific part to omniorb -# (include from file adm/unix/make_omniorb generated by -# adm/unix/make_omniorb.in) -#======================================================================= -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 29/06/2001 -# $Header$ -# - -# Client and server object are the same with omniorb -# There are one header file and one source file generate - -#IDLOBJ=$(IDLSRC:%.idl=%$(IDL_CLN_OBJ)) - -# dependancies between idl and it's generated files -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${KERNEL_ROOT_DIR}/idl/salome/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${GEOM_ROOT_DIR}/idl/salome/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${MED_ROOT_DIR}/idl/salome/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -%$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_srcdir}/idl/%.idl - $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< - -# dependncies between idl files -depend_idl: .depidl - -# we use cpp to generate dependencies between idl files. -# we change cpp output to keep only idl file and transform it to get a suitable rule -.depidl: $(IDL_FILES) - @touch $@ - @for dep in $? dummy; do \ - if [ $$dep != "dummy" ]; then \ - echo Building dependencies for $$dep; \ - basedep=`basename $$dep .idl`; \ - header="$$basedep"$(IDL_CLN_H); \ - sed '\%^'"$$header"':%,\%[^\\]$$%d' <$@ >$@- && mv $@- $@; \ - $(CPP) $(C_DEPEND_FLAG) -I$(srcdir) $$dep 2>/dev/null | \ - sed `echo "s%$$basedep\\.idl%$$header:%g"` | \ - sed 's% $(srcdir)/% %g' | \ - sed 's% $(top_srcdir)/% %g' | \ - sed 's% $(top_builddir)/% %g' | \ - sed 's%^.*:\.o: *%%' | sed 's%^ *\\ *%%'| sed 's%^ *\(.*\):%\1:%' | \ - sed 's/\.idl/$(IDL_CLN_H)/' >>$@; \ - echo '' >>$@; \ - fi; \ - done ; - --include .depidl - -#======================================================================= -# End specific part to omniorb -#======================================================================= diff --git a/bin/Makefile.am b/bin/Makefile.am new file mode 100644 index 000000000..4fdbc5386 --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,36 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# -* Makefile *- +# +# Author : Guillaume Boulant (CSSI) +# Module : KERNEL +# $Header$ +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# These files are data, module or lib files +nodist_salomescript_DATA= VERSION + +EXTRA_DIST+= VERSION.in diff --git a/build_configure b/build_configure index 121fb5d2a..701a26d30 100755 --- a/build_configure +++ b/build_configure @@ -6,6 +6,7 @@ # # Author : Marc Tajchman - CEA # Date : 10/10/2002 +# Modified by : Alexander BORODIN (OCN) - autotools usage # $Header$ # @@ -51,194 +52,66 @@ if test ! -d "${GEOM_ROOT_DIR}"; then exit fi -######################################################################## -# find_in - utility function -# -# usage : -# find_in directory filename -# -# Finds files following the *.in pattern, recursively in the -# directory (first argument). -# Results are appended into the file (second argument) -# -# Difference from the standard unix find is that files are tested -# before directories -# - -find_in() -{ - local i - local f=$2 - -# if the first argument is not a directory, returns - - if [ ! -d "$1" ] ; then - return - fi - -# dont look in the CVS directories - - case $1 in - */CVS) return ;; - */adm_local/*) return ;; - *) ;; - esac - -# for each regular file contained in the directory -# test if it's a .in file - - for i in "$1"/* - do - if [ -f "$i" ] ; then - case $i in - *.in) echo " "$i" \\" >> $f;; - *) ;; - esac - fi - done - -# for each subdirectory of the first argument, proceeds recursively - - for i in "$1"/* - do - if [ -d "$i" ] ; then - find_in "$i" "$f" - fi - done -} - - -####################################################################### -# Generate list of .in files (Makefile.in, config.h.in, etc) -# appending it in file configure.in cd ${CONF_DIR} ABS_CONF_DIR=`pwd` -# -# Common part of the configure.in file -# -chmod u+w configure.in.base -if ! \cp -f configure.in.base configure.in_tmp1 -then - echo - echo "error : can't create files in" ${CONF_DIR} - echo "aborting ..." - chmod u-w configure.in.base - exit -fi -chmod u-w configure.in.base - -if [ -e "${CONF_DIR}/salome_adm" ] ; then - \rm -f ${CONF_DIR}/salome_adm -fi - -# make a link allowing AC_OUTPUT to find the salome_adm/.../*.in files -echo "" >> configure.in_tmp1 -echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1 - -echo "" >> configure.in_tmp1 -echo "AC_OUTPUT([ \\" >> configure.in_tmp1 - -# -# List of .in files in the adm/unix directory -# These files MUST be on top of AC_OUTPUT list so we -# put them "manually" -# - -echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 -echo " ./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1 -echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 - -\rm -f configure.in_tmp2 configure.in_tmp3 -touch configure.in_tmp2 -find_in . configure.in_tmp2 -sed -e '/^...salome_adm/d' configure.in_tmp2 > configure.in_tmp3 -sed -e '/^...adm_local.unix.make_omniorb/d' configure.in_tmp3 > configure.in_tmp2 -sed -e '/^...adm_local.unix.make_commence/d' configure.in_tmp2 > configure.in_tmp3 -sed -e '/configure.in/d' configure.in_tmp3 > configure.in_tmp2 -sed -e 's/.in / /' configure.in_tmp2 >> configure.in_tmp1 -#sed '/^.salome_adm/d' configure.in_tmp2 > configure.in_tmp3 -#sed '/configure.in/d' configure.in_tmp3 > configure.in_tmp2 -#sed 's/.in / /' configure.in_tmp2 >> configure.in_tmp1 - -echo "])" >> configure.in_tmp1 - -# delete the link created for AC_OUTPUT -echo "" >> configure.in_tmp1 -#echo 'rm -f ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1 -\mv configure.in_tmp1 configure.in_new -\rm -f configure.in_tmp2 configure.in_tmp3 - - -######################################################################## -# Create new (or replace old) configure.in file -# Print a message if the file is write protected -# - -echo -if test ! -f configure.in -then - echo -n "Creating new file 'configure.in' ... " - if \mv configure.in_new configure.in >& /dev/null - then - echo "done" - else - echo "error, check your file permissions" - fi -else - echo -n "Updating 'configure.in' file ... " - if ! \cp configure.in configure.in_old >& /dev/null - then - echo - echo - echo "Can't backup previous configure.in" - echo -n "Continue (you will not be able to revert) - (Y/N) ? " - read R - case "x$R" in - xn*) exit;; - xN*) exit;; - esac - echo - echo -n " " - fi - if \cp configure.in_new configure.in >& /dev/null - then - echo "done" - else - echo - echo "error, can't update previous configure.in" - fi -fi - -######################################################################## -# Use autoconf to rebuild the configure script -# - -if test -f configure -then - echo -n "Updating 'configure' script ... " -else - echo -n "Creating 'configure' script ... " -fi - -aclocal -I adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ - -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \ - -I ${MED_ROOT_DIR}/adm_local/unix/config_files \ - -I ${GEOM_ROOT_DIR}/adm_local/unix/config_files -if autoconf -then - echo "done" -else - echo "failed (check file permissions and/or user quotas ...)" -fi - -cd ${ORIG_DIR} - -echo +mkdir -p salome_adm/unix/config_files +cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files +cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix + +cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix + +cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files +cp -f ${MED_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files +cp -f ${GEOM_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files + +# ____________________________________________________________________ +# aclocal creates the aclocal.m4 file from the standard macro and the +# custom macro embedded in the directory salome_adm/unix/config_files +# and KERNEL config_files directory. +# output: +# aclocal.m4 +# autom4te.cache (directory) +echo "====================================================== aclocal" + +aclocal -I adm_local/unix/config_files -I salome_adm/unix/config_files || exit 1 + +# ____________________________________________________________________ +# libtoolize 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). +# output: +# salome_adm/unix/config_files/config.guess +# salome_adm/unix/config_files/config.sub +# salome_adm/unix/config_files/ltmain.sh +#echo "====================================================== libtoolize" + +libtoolize --force --copy --automake || exit 1 + +# ____________________________________________________________________ +# autoconf creates the configure script from the file configure.ac (or +# configure.in if configure.ac doesn't exist) +# output: +# configure +echo "====================================================== autoconf" + +autoconf + +# ____________________________________________________________________ +# automake 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). This step also +# creates the Makefile.in files from the Makefile.am files. +# output: +# salome_adm/unix/config_files/compile +# salome_adm/unix/config_files/depcomp +# salome_adm/unix/config_files/install-sh +# salome_adm/unix/config_files/missing +# salome_adm/unix/config_files/py-compile +# Makefile.in (from Makefile.am) +echo "====================================================== automake" + +automake --copy --gnu --add-missing diff --git a/configure.ac b/configure.ac new file mode 100644 index 000000000..ab62f2c5c --- /dev/null +++ b/configure.ac @@ -0,0 +1,455 @@ +# +# Author : Marc Tajchman (CEA) +# Date : 28/06/2001 +# Modified by : Patrick GOLDBRONN (CEA) +# Modified by : Marc Tajchman (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# +# Created from configure.in.base +# + + +AC_INIT([Salome2 Project SMESH module], [4.0.0], [gboulant@CS], [salome]) +AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) +AC_CANONICAL_HOST +AC_CANONICAL_TARGET +AM_INIT_AUTOMAKE + +PACKAGE=salome +AC_SUBST(PACKAGE) + +VERSION=4.0.0 +XVERSION=0x040000 +AC_SUBST(VERSION) +AC_SUBST(XVERSION) + +# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) +MODULE_NAME=smesh +AC_SUBST(MODULE_NAME) + +echo +echo --------------------------------------------- +echo Initialize source and build root directories +echo --------------------------------------------- +echo + +dnl +dnl Initialize source and build root directories +dnl + +ROOT_BUILDDIR=`pwd` +ROOT_SRCDIR=`echo $0 | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` +cd $ROOT_SRCDIR +ROOT_SRCDIR=`pwd` +cd $ROOT_BUILDDIR + +AC_SUBST(ROOT_SRCDIR) +AC_SUBST(ROOT_BUILDDIR) + +echo +echo Source root directory : $ROOT_SRCDIR +echo Build root directory : $ROOT_BUILDDIR +echo +echo + +if test -z "$AR"; then + AC_CHECK_PROGS(AR,ar xar,:,$PATH) +fi +AC_SUBST(AR) + +dnl Export the AR macro so that it will be placed in the libtool file +dnl correctly. +export AR + +echo +echo --------------------------------------------- +echo testing make +echo --------------------------------------------- +echo + +AC_PROG_MAKE_SET +AC_PROG_INSTALL +dnl +dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! + +echo +echo --------------------------------------------- +echo Coniguring production +echo --------------------------------------------- +echo +AC_ENABLE_DEBUG(yes) +AC_DISABLE_PRODUCTION + +echo --------------------------------------------- +echo testing libtool +echo --------------------------------------------- + +dnl first, we set static to no! +dnl if we want it, use --enable-static +AC_ENABLE_STATIC(no) + +AC_LIBTOOL_DLOPEN +AC_PROG_LIBTOOL + +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_BUILDDIR}'/salome_adm/unix/config_files/install-sh + ;; +esac + +echo +echo --------------------------------------------- +echo testing C/C++ +echo --------------------------------------------- +echo + +cc_ok=no +dnl inutil car libtool +dnl AC_PROG_CC +AC_PROG_CXX +AC_CXX_WARNINGS +AC_CXX_TEMPLATE_OPTIONS +AC_DEPEND_FLAG +# AC_CC_WARNINGS([ansi]) +cc_ok=yes + +dnl Library libdl : +AC_CHECK_LIB(dl,dlopen) + +dnl add library libm : +AC_CHECK_LIB(m,ceil) + +dnl +dnl Well we use sstream which is not in gcc pre-2.95.3 +dnl We must test if it exists. If not, add it in include ! +dnl + +AC_CXX_HAVE_SSTREAM + +dnl +dnl --------------------------------------------- +dnl testing MPICH +dnl --------------------------------------------- +dnl + +CHECK_MPICH + +echo +echo --------------------------------------------- +echo testing LEX \& YACC +echo --------------------------------------------- +echo + +lex_yacc_ok=no +AC_PROG_YACC +AC_PROG_LEX +lex_yacc_ok=yes + +echo +echo --------------------------------------------- +echo testing python +echo --------------------------------------------- +echo + +CHECK_PYTHON + +dnl echo +dnl echo --------------------------------------------- +dnl echo testing java +dnl echo --------------------------------------------- +dnl echo + +dnl CHECK_JAVA + +echo +echo --------------------------------------------- +echo testing swig +echo --------------------------------------------- +echo + +AM_PATH_PYTHON(2.3) +CHECK_SWIG + +echo +echo --------------------------------------------- +echo testing threads +echo --------------------------------------------- +echo + +ENABLE_PTHREADS + +if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then +echo +echo --------------------------------------------- +echo testing omniORB +echo --------------------------------------------- +echo + +CHECK_OMNIORB + +dnl echo +dnl echo --------------------------------------------- +dnl echo testing mico +dnl echo --------------------------------------------- +dnl echo + +dnl CHECK_MICO + +echo +echo --------------------------------------------- +echo default ORB : omniORB +echo --------------------------------------------- +echo + +DEFAULT_ORB=omniORB + +echo +echo --------------------------------------------- +echo testing Corba +echo --------------------------------------------- +echo + +CHECK_CORBA + +AC_SUBST_FILE(CORBA) +corba=make_$ORB +CORBA=adm_local/unix/$corba + +fi +echo +echo --------------------------------------------- +echo testing openGL +echo --------------------------------------------- +echo + +CHECK_OPENGL + +echo +echo --------------------------------------------- +echo testing QT +echo --------------------------------------------- +echo + +CHECK_QT + +echo +echo --------------------------------------------- +echo testing msg2qm +echo --------------------------------------------- +echo + +CHECK_MSG2QM + +echo +echo --------------------------------------------- +echo testing VTK +echo --------------------------------------------- +echo + +CHECK_VTK + +echo +echo --------------------------------------------- +echo testing HDF5 +echo --------------------------------------------- +echo + +CHECK_HDF5 + +echo +echo --------------------------------------------- +echo BOOST Library +echo --------------------------------------------- +echo + +CHECK_BOOST + +echo +echo --------------------------------------------- +echo Testing OpenCascade +echo --------------------------------------------- +echo + +CHECK_CAS + +echo +echo --------------------------------------------- +echo Testing qwt +echo --------------------------------------------- +echo + +CHECK_QWT + +echo +echo --------------------------------------------- +echo Testing html generators +echo --------------------------------------------- +echo + +CHECK_HTML_GENERATORS + +echo +echo --------------------------------------------- +echo Testing GUI +echo --------------------------------------------- +echo + +CHECK_SALOME_GUI + +echo +echo --------------------------------------------- +echo Testing full GUI +echo --------------------------------------------- +echo + +CHECK_CORBA_IN_GUI +if test "x${CORBA_IN_GUI}" != "xyes"; then + echo "failed : For configure SMESH module necessary full GUI !" + exit +fi + +echo +echo --------------------------------------------- +echo Testing Kernel +echo --------------------------------------------- +echo + +CHECK_KERNEL + +echo +echo --------------------------------------------- +echo Testing Geom +echo --------------------------------------------- +echo + +CHECK_GEOM + +echo +echo --------------------------------------------- +echo Testing Med +echo --------------------------------------------- +echo + +CHECK_MED + + +AM_CONDITIONAL( USE_GFORTRAN, [test "$F77" = "gfortran"]) + +echo +echo --------------------------------------------- +echo Summary +echo --------------------------------------------- +echo + +echo Configure +variables="cc_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok qwt_ok Kernel_ok Geom_ok Med_ok" + +for var in $variables +do + printf " %10s : " `echo \$var | sed -e "s,_ok,,"` + eval echo \$$var +done + +echo +echo "Default ORB : $DEFAULT_ORB" +echo + +dnl We don t need to say when we re entering directories if we re using +dnl GNU make becuase make does it for us. +if test "X$GMAKE" = "Xyes"; then + AC_SUBST(SETX) SETX=":" +else + AC_SUBST(SETX) SETX="set -x" +fi + +dnl AM_CONDITIONAL(GUI_ENABLE_CORBA, [test "$GUI_DISABLE_CORBA" = no]) +dnl AM_CONDITIONAL(ENABLE_PYCONSOLE, [test "$DISABLE_PYCONSOLE" = no]) +dnl AM_CONDITIONAL(ENABLE_GLVIEWER, [test "$DISABLE_GLVIEWER" = no]) +dnl AM_CONDITIONAL(ENABLE_PLOT2DVIEWER, [test "$DISABLE_PLOT2DVIEWER" = no]) +dnl AM_CONDITIONAL(ENABLE_SUPERVGRAPHVIEWER, [test "$DISABLE_SUPERVGRAPHVIEWER" = no]) +dnl AM_CONDITIONAL(ENABLE_OCCVIEWER, [test "$DISABLE_OCCVIEWER" = no]) +dnl AM_CONDITIONAL(ENABLE_VTKVIEWER, [test "$DISABLE_VTKVIEWER" = no]) +dnl AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no]) + +echo +echo --------------------------------------------- +echo copying resource files, shell scripts, and +echo xml files +echo --------------------------------------------- +echo + + +dnl copy shells and utilities contained in the bin directory +dnl excluding .in files (treated in AC-OUTPUT below) and CVS +dnl directory + +mkdir -p bin/salome +cd bin/salome + +for i in $ROOT_SRCDIR/bin/* +do + local_bin=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` + case "$local_bin" in + *.in | *~) ;; + ./bin/CVS | ./bin/salome) ;; + *) $INSTALL $i . ; echo $local_bin ;; + esac +done +cd $ROOT_BUILDDIR + +echo +echo --------------------------------------------- +echo generating Makefiles and configure files +echo --------------------------------------------- +echo + +AC_OUTPUT_COMMANDS([ \ + chmod +x ./bin/*; \ + chmod +x ./bin/salome/*; \ +]) + +# This list is initiated using autoscan and must be updated manually +# when adding a new file .in to manage. When you execute +# autoscan, the Makefile list is generated in the output file configure.scan. +# This could be helpfull to update de configuration. +AC_OUTPUT([ \ + ./salome_adm/unix/SALOMEconfig.h \ + ./adm_local/Makefile \ + ./adm_local/unix/Makefile \ + ./adm_local/unix/config_files/Makefile \ + ./bin/VERSION \ + ./bin/Makefile \ + ./SMESH_version.h \ + ./doc/Makefile \ + ./doc/salome/Makefile \ + ./doc/salome/gui/Makefile \ + ./doc/salome/tui/Makefile \ + ./doc/salome/tui/SMESH/doxyfile \ + ./doc/salome/tui/SMESH/sources/static/tree.js \ + ./src/Makefile \ + ./src/Controls/Makefile \ + ./src/Driver/Makefile \ + ./src/DriverDAT/Makefile \ + ./src/DriverMED/Makefile \ + ./src/DriverSTL/Makefile \ + ./src/DriverUNV/Makefile \ + ./src/MEFISTO2/Makefile \ + ./src/OBJECT/Makefile \ + ./src/SMDS/Makefile \ + ./src/SMESH/Makefile \ + ./src/SMESHClient/Makefile \ + ./src/SMESHDS/Makefile \ + ./src/SMESHFiltersSelection/Makefile \ + ./src/SMESHGUI/Makefile \ + ./src/SMESH_I/Makefile \ + ./src/SMESH_SWIG/Makefile \ + ./src/StdMeshers/Makefile \ + ./src/StdMeshersGUI/Makefile \ + ./src/StdMeshers_I/Makefile \ + ./resources/Makefile \ + ./resources/SMESHCatalog.xml \ + ./idl/Makefile \ + Makefile +]) diff --git a/adm_local/Makefile.in b/doc/Makefile.am similarity index 71% rename from adm_local/Makefile.in rename to doc/Makefile.am index e2133b49b..dcbc00f24 100644 --- a/adm_local/Makefile.in +++ b/doc/Makefile.am @@ -17,44 +17,14 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:$(srcdir)/adm_local - - -all: resources - -install: - cp -rf @top_srcdir@/adm_local @prefix@ - -bin: - -resources : - cp -rf @top_srcdir@/adm_local $(top_builddir) - -inc: - -lib: - -depend: - -depend_idl: -install-end: - -install-include: - -install-bin: - -uninstall: - -uninstall-idl: - -distclean: - -clean: - -distclean-other: +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 30/11/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header$ +# +# source path +SUBDIRS= salome diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.am similarity index 53% rename from doc/salome/Makefile.in rename to doc/salome/Makefile.am index 4106d1ad3..43c97dd62 100644 --- a/doc/salome/Makefile.in +++ b/doc/salome/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -22,57 +21,22 @@ # # Author : Patrick GOLDBRONN (CEA) # Date : 30/11/2001 -# $Header$ +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header: # -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ SUBDIRS= tui gui SUBDIRSTUI= tui SUBDIRSGUI= gui -@COMMENCE@ - usr_docs: @@SETX@; for d in $(SUBDIRSGUI); do \ (cd $$d && $(MAKE) $@) || exit 1; \ - done; \ + done; docs: usr_docs dev_docs: @@SETX@; for d in $(SUBDIRSTUI); do \ (cd $$d && $(MAKE) $@) || exit 1; \ - done; \ - -clean: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/SMESH; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/SMESH; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -install: - $(MAKE) docs - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/SMESH; then \ - (cd $$d && $(MAKE) $@); \ - fi; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/SMESH; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done; \ + done; diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.am similarity index 81% rename from doc/salome/gui/Makefile.in rename to doc/salome/gui/Makefile.am index c08ee2735..f1bbb6dcc 100644 --- a/doc/salome/gui/Makefile.in +++ b/doc/salome/gui/Makefile.am @@ -1,5 +1,4 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,15 +18,12 @@ # # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : doc -# $Header: -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +EXTRA_DIST+=SMESH usr_docs: cp -fr $(srcdir)/SMESH ./ @@ -35,16 +31,14 @@ usr_docs: docs: usr_docs -clean: +clean-local: rm -fr `ls | grep -v "Makefile"` - -distclean: clean rm -fr SMESH -install: +install-data-local: usr_docs mkdir -p $(docdir)/gui cp -rf SMESH $(docdir)/gui -find $(PWD) -name CVS -prune -exec rm -rf {} \; -uninstall: +uninstall-local: rm -rf $(docdir)/gui/SMESH diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am new file mode 100644 index 000000000..8e7772c65 --- /dev/null +++ b/doc/salome/tui/Makefile.am @@ -0,0 +1,57 @@ +# Copyright (C) 2005 CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# File : Makefile.in +# Author : Vasily Rusyaev (Open Cascade NN) +# Module : doc + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +EXTRA_DIST += SMESH + +dev_docs: + cp -fr $(srcdir)/SMESH ./INPUT; \ + cp -f ./SMESH/doxyfile ./INPUT; \ + cd INPUT; \ + sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ + sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ + if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ + sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + $(doxygen) -u ./doxyfile1; \ + else \ + sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + fi; \ + if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \ + sed -e 's|BUILTIN_STL_SUPPORT = NO|BUILTIN_STL_SUPPORT = YES|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + fi; \ + mv -f doxyfile1 doxyfile; \ + echo "Running doxygen in directory:"`pwd`; \ + $(doxygen) ./doxyfile; \ + cd ../; \ + cp -fr $(srcdir)/SMESH/sources/ SMESH ; \ + rm -fr INPUT + +doctuidir=$(docdir)/tui/SMESH + +nodist_doctui_DATA= SMESH/doxyfile +EXTRA_DIST+= SMESH/doxyfile.in diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in deleted file mode 100644 index ba71fe6fb..000000000 --- a/doc/salome/tui/Makefile.in +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -root_srcdir=@ROOT_SRCDIR@ -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -PYTHON_SCRIPTS = \ - smesh.py - -dev_docs: - cp -fr $(srcdir)/SMESH ./INPUT; \ - cp -fr ./SMESH/doxyfile ./SMESH/doxyfile_py ./INPUT; \ - cp -fr ./SMESH/sources/static/tree.js ./INPUT/sources/static; \ - cd INPUT; \ - sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ - sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - if (test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ - echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ - sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - $(doxygen) -u ./doxyfile1; \ - if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \ - sed -e 's|BUILTIN_STL_SUPPORT = NO|BUILTIN_STL_SUPPORT = YES|' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - fi; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - cd ..; \ - else \ - sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ - mv -f doxyfile2 doxyfile1; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - mkdir py1; mkdir py2; \ - cd ..; \ - for file in $(PYTHON_SCRIPTS) dummy; do \ - if [ $$file != "dummy" ]; then \ - cp $(root_srcdir)/src/GEOM_SWIG/$$file INPUT/py1/; \ - fi ; \ - done; \ - cd INPUT; \ - python $(KERNEL_ROOT_DIR)/doc/salome/tui/KERNEL/pythfilter.py ./py1 ./py2; \ - sed 's|list_py_files_to_process|$(PYTHON_SCRIPTS)|' ./doxyfile_py > py2/doxyfile_py; \ - cd py2; \ - $(doxygen) ./doxyfile_py; \ - cd ../..; \ - fi; \ - cp -fr $(srcdir)/SMESH/sources/static/*.* ./SMESH/ - cp -fr $(srcdir)/SMESH/sources/ SMESH/ - cp -fr $(srcdir)/SMESH/HTML/ SMESH/ - rm -fr INPUT - -clean: - rm -fr SMESH - -distclean: clean - rm -fr INPUT - -install: - $(INSTALL) -d $(docdir); \ - mkdir -p $(docdir)/tui - cp -fr SMESH $(docdir)/tui - -uninstall: - rm -fr $(docdir)/tui/SMESH diff --git a/idl/Makefile.am b/idl/Makefile.am new file mode 100644 index 000000000..0e8dc99b8 --- /dev/null +++ b/idl/Makefile.am @@ -0,0 +1,132 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# +# 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. +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +BASEIDL_FILES = \ + SMESH_Gen.idl \ + SMESH_Mesh.idl \ + SMESH_Hypothesis.idl \ + SMESH_BasicHypothesis.idl \ + SMESH_Filter.idl \ + SMESH_Group.idl \ + SMESH_Pattern.idl + +EXTRA_DIST+= $(BASEIDL_FILES) + +# This variable defines the files to be installed +salomeidl_DATA = $(BASEIDL_FILES) + +# GUI idl common library +lib_LTLIBRARIES = libSalomeIDLSMESH.la + +# Sources built from idl files +nodist_libSalomeIDLSMESH_la_SOURCES = \ + SMESH_MeshSK.cc \ + SMESH_HypothesisSK.cc \ + SMESH_GenSK.cc \ + SMESH_BasicHypothesisSK.cc \ + SMESH_FilterSK.cc \ + SMESH_GroupSK.cc \ + SMESH_PatternSK.cc + +# header files must be exported: other modules have to use this library +nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) + +libSalomeIDLSMESH_la_CPPFLAGS =\ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GEOM_CXXFLAGS) +libSalomeIDLSMESH_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeIDLSMESH_la_LIBADD = \ + @CORBA_LIBS@ \ + $(MED_LDFLAGS) -lSalomeIDLMED \ + $(GEOM_LDFLAGS) -lSalomeIDLGEOM + +# These variables defines the building process of CORBA files +OMNIORB_IDL = @OMNIORB_IDL@ +OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +OMNIORB_IDLPYFLAGS = \ + @OMNIORB_IDLPYFLAGS@ \ + -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome \ + -I$(MED_ROOT_DIR)/idl/salome \ + -I$(GEOM_ROOT_DIR)/idl/salome + +IDLCXXFLAGS = \ + -bcxx \ + @IDLCXXFLAGS@ \ + -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome \ + -I$(MED_ROOT_DIR)/idl/salome \ + -I$(GEOM_ROOT_DIR)/idl/salome \ + -I$(top_builddir)/salome_adm/unix + +IDLPYFLAGS = \ + @IDLPYFLAGS@ \ + -I$(KERNEL_ROOT_DIR)/idl/salome \ + -I$(MED_ROOT_DIR)/idl/salome \ + -I$(GEOM_ROOT_DIR)/idl/salome + +# potential problem on parallel make on the following - multiple outputs +SUFFIXES = .idl .hh SK.cc +.idlSK.cc: + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< +.idl.hh: + $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< + +install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%) + $(INSTALL) -d $(pkgpythondir) + ls $^ | while read file; do \ + $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ + done + +# uninstall-local removes too much, but it works in distcheck +uninstall-local: + rm -rf $(pkgpythondir)/* + +mostlyclean-local: + -rm -f *.hh *.cc .depidl + +# we use cpp to generate dependencies between idl files. +# option x c tells the preprocessor to consider idl as a c file. +# if an idl is modified, all idl dependencies are rebuilt + +.depidl: $(BASEIDL_FILES) + @echo "" > $@ + @for dep in $^ dummy; do \ + if [ $$dep != "dummy" ]; then \ + echo Building dependencies for $$dep; \ + $(CPP) $(C_DEPEND_FLAG) -x c -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome $$dep 2>/dev/null | \ + sed 's/\.o/\SK.cc/' >>$@; \ + fi; \ + done ; + +-include .depidl diff --git a/idl/Makefile.in b/idl/Makefile.in deleted file mode 100644 index 65dc0f799..000000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# generate dependencies for idl file : -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:${KERNEL_ROOT_DIR}/idl/salome:${GEOM_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome - -@COMMENCE@ - -IDL_FILES = \ - SMESH_Gen.idl \ - SMESH_Mesh.idl \ - SMESH_Hypothesis.idl \ - SMESH_BasicHypothesis.idl \ - SMESH_Filter.idl \ - SMESH_Group.idl \ - SMESH_Pattern.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 $@ - -$(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@LIB_LOCATION_SUFFIX@/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: install-pyidl install-idl - -# create directory $(idldir) and copy idl files into it -install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) - $(INSTALL) -d $(idldir) - $(INSTALL_DATA) $^ $(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/resources/Makefile.am b/resources/Makefile.am new file mode 100644 index 000000000..2593cf94c --- /dev/null +++ b/resources/Makefile.am @@ -0,0 +1,173 @@ +# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 28/06/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header$ +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_salomeres_DATA = \ + delete.png \ + mesh_add_sub.png \ + mesh_algo_hexa.png \ + mesh_algo_mefisto.png \ + mesh_algo_quad.png \ + mesh_algo_regular.png \ + mesh_algo_tetra.png \ + mesh_angle.png \ + mesh_area.png \ + mesh_aspect.png \ + mesh_aspect_3d.png \ + mesh_compute.png \ + mesh_connectivity.png \ + mesh_diagonal.png \ + mesh_edit.png \ + mesh_hexa_n.png \ + mesh_hexa.png \ + mesh_hypo_area.png \ + mesh_hypo_length.png \ + mesh_hypo_segment.png \ + mesh_hypo_volume.png \ + mesh_hypo_edit.png \ + mesh_info.png \ + advanced_mesh_info.png \ + standard_mesh_info.png \ + mesh_init.png \ + mesh_length.png \ + mesh_length_2d.png \ + mesh_free_edges.png \ + mesh_free_edges_2d.png \ + mesh_multi_edges.png \ + mesh_multi_edges_2d.png \ + mesh_line_n.png \ + mesh_line.png \ + mesh_move_node.png \ + mesh_orientation.png \ + mesh.png \ + mesh_polygon.png \ + mesh_polyhedron.png \ + mesh_pyramid_n.png \ + mesh_pyramid.png \ + mesh_quad_n.png \ + mesh_quad.png \ + mesh_rem_element.png \ + mesh_rem_node.png \ + mesh_set_algo.png \ + mesh_set_hypo.png \ + mesh_shading.png \ + mesh_shrink.png \ + mesh_skew.png \ + mesh_taper.png \ + mesh_tetra_n.png \ + mesh_tetra.png \ + mesh_tree_algo_hexa.png \ + mesh_tree_algo_mefisto.png \ + mesh_tree_algo.png \ + mesh_tree_algo_quad.png \ + mesh_tree_algo_regular.png \ + mesh_tree_algo_tetra.png \ + mesh_tree_algo_netgen_2d3d.png \ + mesh_tree_algo_netgen_2d.png \ + mesh_tree_hypo_area.png \ + mesh_tree_hypo_length.png \ + mesh_tree_hypo.png \ + mesh_tree_hypo_segment.png \ + mesh_tree_hypo_volume.png \ + mesh_tree_hypo_netgen.png \ + mesh_tree_hypo_netgen_2d.png \ + mesh_tree_mesh.png \ + mesh_tree_importedmesh.png \ + mesh_tree_mesh_warn.png \ + mesh_triangle_n.png \ + mesh_triangle.png \ + mesh_update.png \ + mesh_vertex_n.png \ + mesh_vertex.png \ + mesh_volume_3d.png \ + mesh_wireframe.png \ + mesh_points.png \ + mesh_wrap.png \ + mesh_tree_group.png \ + mesh_edit_group.png \ + mesh_make_group.png \ + mesh_union2tri.png \ + mesh_uniontri.png \ + mesh_cutquad.png \ + mesh_smoothing.png \ + mesh_renumbering_nodes.png \ + mesh_renumbering_elements.png \ + mesh_extrusion.png \ + mesh_extrusionpath.png \ + mesh_revolution.png \ + ModuleMesh.png \ + mesh_unionGroups.png \ + mesh_intersectGroups.png \ + mesh_cutGroups.png \ + mesh_deleteGroups.png \ + mesh_translation_vector.png \ + mesh_translation_points.png \ + mesh_rotation.png \ + mesh_symmetry_point.png \ + mesh_symmetry_axis.png \ + mesh_symmetry_plane.png \ + mesh_sew_freeborders.png \ + mesh_sew_conform_freeborders.png \ + mesh_sew_bordertoside.png \ + mesh_sew_sideelements.png \ + mesh_merge_nodes.png \ + mesh_merge_elements.png \ + select1.png \ + SMESH_en.xml \ + SMESH.config \ + StdMeshers.xml \ + SMESHCatalog.xml \ + SalomeApp.xml \ + mesh_pattern.png \ + pattern_sample_2d.png \ + pattern_sample_3D.png \ + mesh_add.png \ + mesh_remove.png \ + mesh_quad_edge.png \ + mesh_quad_triangle.png \ + mesh_quad_quadrangle.png \ + mesh_quad_tetrahedron.png \ + mesh_quad_pyramid.png \ + mesh_quad_pentahedron.png \ + mesh_quad_hexahedron.png \ + mesh_conv_to_quad.png \ + mesh_tree_hypo_layers_distribution.png \ + mesh_tree_algo_radial_prism.png \ + mesh_tree_algo_projection_3d.png \ + mesh_tree_algo_projection_2d.png \ + mesh_hypo_source_edge.png \ + mesh_hypo_source_3d.png \ + mesh_hypo_layer_distribution.png \ + mesh_hypo_source_face.png \ + mesh_tree_hypo_source_face.png \ + mesh_tree_hypo_source_edge.png \ + mesh_tree_hypo_source_3d_shape.png \ + mesh_tree_hypo_projection_3d.png \ + mesh_tree_hypo_projection_2d.png + +nodist_salomeres_DATA = SMESHCatalog.xml diff --git a/src/DriverSTL/Makefile.in b/src/Controls/Makefile.am similarity index 55% rename from src/DriverSTL/Makefile.in rename to src/Controls/Makefile.am index 76c594f62..51e0623e3 100644 --- a/src/DriverSTL/Makefile.in +++ b/src/Controls/Makefile.am @@ -1,5 +1,3 @@ -# SMESH DriverSTL : driver to read and write 'stl' files -# # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # @@ -19,43 +17,47 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# -# # File : Makefile.in -# Author : Marc Tajchman (CEA) +# Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= DriverSTL_R_SMDS_Mesh.h DriverSTL_W_SMDS_Mesh.h SMESH_DriverSTL.hxx +salomeinclude_HEADERS = \ + SMESH_Controls.hxx \ + SMESH_ControlsDef.hxx # Libraries targets -LIB = libMeshDriverSTL.la -LIB_SRC = DriverSTL_R_SMDS_Mesh.cxx DriverSTL_W_SMDS_Mesh.cxx - -# Executables targets -BIN = STL_Test +lib_LTLIBRARIES = libSMESHControls.la -LIB_CLIENT_IDL = +dist_libSMESHControls_la_SOURCES = \ + SMESH_Controls.cxx -LIB_SERVER_IDL = +# Executables targets +bin_PROGRAMS = SMESHControls +dist_SMESHControls_SOURCES = \ + SMESHControls.cxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(OCC_KERNEL_LIBS) -lMeshDriver -lTKSTL -lTKTopAlgo -lTKMesh - -LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO - -@CONCLUDE@ - - - +libSMESHControls_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../SMDS + +libSMESHControls_la_LDFLAGS = \ + ../SMDS/libSMDS.la \ + $(KERNEL_LDFLAGS) -lOpUtil\ + $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d + +SMESHControls_CPPFLAGS = \ + $(libSMESHControls_la_CPPFLAGS) + + +SMESHControls_LDADD = \ + ../SMDS/libSMDS.la \ + libSMESHControls.la \ + $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics \ + $(CAS_LDPATH) -lTKernel -lTKBRep -lTKG3d diff --git a/src/Controls/Makefile.in b/src/Controls/Makefile.in deleted file mode 100644 index 3416e9751..000000000 --- a/src/Controls/Makefile.in +++ /dev/null @@ -1,52 +0,0 @@ -# SMESH OBJECT : interactive object for SMESH visualization -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Module : SMESH - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl - -@COMMENCE@ - -EXPORT_HEADERS = SMESH_Controls.hxx SMESH_ControlsDef.hxx - - -# Libraries targets - -LIB = libSMESHControls.la -LIB_SRC = SMESH_Controls.cxx - -# Executables targets -BIN = SMESHControls -BIN_SRC = - -CPPFLAGS+=$(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS+=$(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lOpUtil -lSMDS -lTKBRep -lTKG3d - -LDFLAGSFORBIN += -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKBRep -lTKG3d - -@CONCLUDE@ diff --git a/src/Driver/Makefile.in b/src/Driver/Makefile.am similarity index 65% rename from src/Driver/Makefile.in rename to src/Driver/Makefile.am index 3cea30b31..9ee193136 100644 --- a/src/Driver/Makefile.in +++ b/src/Driver/Makefile.am @@ -23,38 +23,35 @@ # # File : Makefile.in # Author : Marc Tajchman (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= Driver_Document.h Driver_Mesh.h \ - Driver_SMDS_Mesh.h Driver_SMESHDS_Mesh.h +salomeinclude_HEADERS = \ + Driver_Document.h \ + Driver_Mesh.h \ + Driver_SMDS_Mesh.h \ + Driver_SMESHDS_Mesh.h # Libraries targets -LIB = libMeshDriver.la -LIB_SRC = Driver_Document.cxx Driver_Mesh.cxx \ - Driver_SMDS_Mesh.cxx Driver_SMESHDS_Mesh.cxx - -LIB_CLIENT_IDL = +lib_LTLIBRARIES = libMeshDriver.la -LIB_SERVER_IDL = +dist_libMeshDriver_la_SOURCES = \ + Driver_Document.cxx \ + Driver_Mesh.cxx \ + Driver_SMDS_Mesh.cxx \ + Driver_SMESHDS_Mesh.cxx # additionnal information to compil and link file -CPPFLAGS += -CXXFLAGS += - -LDFLAGS += $(OCC_KERNEL_LIBS) -lTKTopAlgo -lSMESHDS $(KERNEL_LDFLAGS) -lOpUtil - - -@CONCLUDE@ - - - +libMeshDriver_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../SMESHDS + +libMeshDriver_la_LDFLAGS = \ + ../SMESHDS/libSMESHDS.la \ + $(KERNEL_LDFLAGS) -lOpUtil \ + $(CAS_LDPATH) -TKernel -lTKTopAlgo diff --git a/src/DriverDAT/Makefile.am b/src/DriverDAT/Makefile.am new file mode 100644 index 000000000..b69835788 --- /dev/null +++ b/src/DriverDAT/Makefile.am @@ -0,0 +1,79 @@ +# SMESH DriverDAT : driver to read and write 'dat' files +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Marc Tajchman (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SMESH +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + DriverDAT_R_SMDS_Mesh.h \ + DriverDAT_R_SMESHDS_Mesh.h \ + DriverDAT_R_SMESHDS_Document.h \ + DriverDAT_W_SMDS_Mesh.h \ + DriverDAT_W_SMESHDS_Mesh.h \ + DriverDAT_W_SMESHDS_Document.h \ + SMESH_DriverDAT.hxx + +# Libraries targets +lib_LTLIBRARIES = libMeshDriverDAT.la + +dist_libMeshDriverDAT_la_SOURCES = \ + DriverDAT_R_SMDS_Mesh.cxx \ + DriverDAT_R_SMESHDS_Mesh.cxx \ + DriverDAT_R_SMESHDS_Document.cxx \ + DriverDAT_W_SMDS_Mesh.cxx \ + DriverDAT_W_SMESHDS_Mesh.cxx \ + DriverDAT_W_SMESHDS_Document.cxx + +# Executables targets +bin_PROGRAMS = DAT_Test +dist_DAT_Test_SOURCES = \ + DAT_Test.cxx + +# additionnal information to compil and link file +libMeshDriverDAT_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHDS + +libMeshDriverDAT_la_LDFLAGS = \ + ../Driver/libMeshDriver.la \ + $(CAS_KERNEL) + +DAT_Test_CPPFLAGS = \ + $(libMeshDriverDAT_la_CPPFLAGS) + +DAT_Test_LDADD = \ + libMeshDriverDAT.la \ + ../Driver/libMeshDriver.la \ + ../SMDS/libSMDS.la \ + $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics + diff --git a/src/DriverMED/Makefile.in b/src/DriverMED/Makefile.am similarity index 54% rename from src/DriverMED/Makefile.in rename to src/DriverMED/Makefile.am index 587ca8fe2..be651b78b 100644 --- a/src/DriverMED/Makefile.in +++ b/src/DriverMED/Makefile.am @@ -23,26 +23,26 @@ # # File : Makefile.in # Author : Marc Tajchman (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS = \ - DriverMED_R_SMDS_Mesh.h DriverMED_R_SMESHDS_Mesh.h DriverMED_R_SMESHDS_Document.h \ - DriverMED_W_SMDS_Mesh.h DriverMED_W_SMESHDS_Mesh.h DriverMED_W_SMESHDS_Document.h \ - DriverMED_Family.h SMESH_DriverMED.hxx +salomeinclude_HEADERS = \ + DriverMED_R_SMDS_Mesh.h \ + DriverMED_R_SMESHDS_Mesh.h \ + DriverMED_R_SMESHDS_Document.h \ + DriverMED_W_SMDS_Mesh.h \ + DriverMED_W_SMESHDS_Mesh.h \ + DriverMED_W_SMESHDS_Document.h \ + DriverMED_Family.h \ + SMESH_DriverMED.hxx # Libraries targets -LIB = libMeshDriverMED.la -LIB_SRC = \ +lib_LTLIBRARIES = libMeshDriverMED.la +dist_libMeshDriverMED_la_SOURCES = \ DriverMED_R_SMDS_Mesh.cxx \ DriverMED_R_SMESHDS_Mesh.cxx \ DriverMED_R_SMESHDS_Document.cxx \ @@ -52,20 +52,44 @@ LIB_SRC = \ DriverMED_Family.cxx # Executables targets -BIN = MED_Test +bin_PROGRAMS = MED_Test -LIB_CLIENT_IDL = +dist_MED_Test_SOURCES = \ + MED_Test.cxx -LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(MED_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) -LDFLAGS += -lMeshDriver $(MED_LDFLAGS) -lMEDWrapper +libMeshDriverMED_la_CPPFLAGS = \ + $(MED_CXXFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHDS \ + -I$(top_builddir)/salome_adm/unix -LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics +libMeshDriverMED_la_LDFLAGS = \ + ../Driver/libMeshDriver.la \ + $(MED_LDFLAGS) -lMEDWrapper -@CONCLUDE@ +MED_Test_CPPFLAGS = \ + $(libMeshDriverMED_la_CPPFLAGS) +MED_Test_LDADD = \ + libMeshDriverMED.la \ + ../Driver/libMeshDriver.la \ + ../SMDS/libSMDS.la \ + ../SMESHDS/libSMESHDS.la \ + $(KERNEL_LDFLAGS) \ + -lOpUtil \ + -lSALOMELocalTrace \ + -lSALOMEBasics \ + $(MED_LDFLAGS) \ + -lMEDWrapper \ + -lMEDWrapperBase \ + -lMEDWrapper_V2_1 \ + -lmed_V2_1 \ + -lMEDWrapper_V2_2 diff --git a/src/DriverSTL/Makefile.am b/src/DriverSTL/Makefile.am new file mode 100644 index 000000000..4e77bfa34 --- /dev/null +++ b/src/DriverSTL/Makefile.am @@ -0,0 +1,74 @@ +# SMESH DriverSTL : driver to read and write 'stl' files +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Marc Tajchman (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SMESH +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + DriverSTL_R_SMDS_Mesh.h \ + DriverSTL_W_SMDS_Mesh.h \ + SMESH_DriverSTL.hxx + +# Libraries targets +lib_LTLIBRARIES = libMeshDriverSTL.la + +dist_libMeshDriverSTL_la_SOURCES = \ + DriverSTL_R_SMDS_Mesh.cxx \ + DriverSTL_W_SMDS_Mesh.cxx + +# Executables targets +bin_PROGRAMS = STL_Test + +dist_STL_Test_SOURCES = \ + STL_Test.cxx + + +# additionnal information to compil and link file +libMeshDriverSTL_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../SMDS + +libMeshDriverSTL_la_LDFLAGS = \ + ../Driver/libMeshDriver.la \ + ../SMDS/libSMDS.la \ + $(CAS_LDPATH) -lTKernel -lTKSTL -lTKTopAlgo -lTKMesh + +STL_Test_CPPFLAGS = \ + $(libMeshDriverSTL_la_CPPFLAGS) + +STL_Test_LDADD = \ + libMeshDriverSTL.la \ + ../Driver/libMeshDriver.la \ + ../SMDS/libSMDS.la \ + $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics \ + $(CAS_LDPATH) -lTKernel -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO + diff --git a/src/DriverUNV/Makefile.in b/src/DriverUNV/Makefile.am similarity index 57% rename from src/DriverUNV/Makefile.in rename to src/DriverUNV/Makefile.am index 58fddc89c..4fed7d82c 100644 --- a/src/DriverUNV/Makefile.in +++ b/src/DriverUNV/Makefile.am @@ -23,52 +23,60 @@ # # File : Makefile.in # Author : Marc Tajchman (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= DriverUNV_R_SMDS_Mesh.h \ - DriverUNV_R_SMESHDS_Mesh.h \ - DriverUNV_R_SMESHDS_Document.h \ - DriverUNV_W_SMDS_Mesh.h \ - DriverUNV_W_SMESHDS_Mesh.h \ - DriverUNV_W_SMESHDS_Document.h \ - SMESH_DriverUNV.hxx +salomeinclude_HEADERS = \ + DriverUNV_R_SMDS_Mesh.h \ + DriverUNV_R_SMESHDS_Mesh.h \ + DriverUNV_R_SMESHDS_Document.h \ + DriverUNV_W_SMDS_Mesh.h \ + DriverUNV_W_SMESHDS_Mesh.h \ + DriverUNV_W_SMESHDS_Document.h \ + SMESH_DriverUNV.hxx # Libraries targets -LIB = libMeshDriverUNV.la -LIB_SRC = \ +lib_LTLIBRARIES = libMeshDriverUNV.la +dist_libMeshDriverUNV_la_SOURCES = \ DriverUNV_R_SMDS_Mesh.cxx \ DriverUNV_R_SMESHDS_Mesh.cxx \ DriverUNV_R_SMESHDS_Document.cxx \ DriverUNV_W_SMESHDS_Document.cxx \ DriverUNV_W_SMDS_Mesh.cxx \ DriverUNV_W_SMESHDS_Mesh.cxx \ - UNV_Utilities.cxx UNV2411_Structure.cxx UNV2412_Structure.cxx UNV2417_Structure.cxx + UNV_Utilities.cxx \ + UNV2411_Structure.cxx \ + UNV2412_Structure.cxx \ + UNV2417_Structure.cxx # Executables targets -BIN = UNV_Test - -LIB_CLIENT_IDL = +bin_PROGRAMS = UNV_Test -LIB_SERVER_IDL = +UNV_Test_SOURCES = \ + UNV_Test.cxx # additionnal information to compil and link file -CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS) - -LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics - -@CONCLUDE@ +libMeshDriverUNV_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHDS +libMeshDriverUNV_la_LDFLAGS = \ + ../Driver/libMeshDriver.la \ + $(CAS_KERNEL) +UNV_Test_CPPFLAGS = \ + $(libMeshDriverUNV_la_CPPFLAGS) +UNV_Test_LDADD = \ + libMeshDriverUNV.la \ + ../Driver/libMeshDriver.la \ + ../SMDS/libSMDS.la \ + $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics diff --git a/src/MEFISTO2/Makefile.in b/src/MEFISTO2/Makefile.am similarity index 68% rename from src/MEFISTO2/Makefile.in rename to src/MEFISTO2/Makefile.am index aea95bcfb..23aecb0dd 100644 --- a/src/MEFISTO2/Makefile.in +++ b/src/MEFISTO2/Makefile.am @@ -19,37 +19,32 @@ # # File : Makefile.in # Author : +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS = aptrte.h Rn.h +salomeinclude_HEADERS = \ + aptrte.h Rn.h # Libraries targets -LIB = libMEFISTO2D.la -LIB_SRC = aptrte.cxx trte.f -# areteideale.f - -LIB_CLIENT_IDL = - -LIB_SERVER_IDL = +lib_LTLIBRARIES = libMEFISTO2D.la +dist_libMEFISTO2D_la_SOURCES = \ + aptrte.cxx \ + trte.f # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +libMEFISTO2D_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) -ifeq ($(F77),gfortran) -LDFLAGS += -lgfortran -else -LDFLAGS += -lg2c -endif +libMEFISTO2D_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace -@CONCLUDE@ +if USE_GFORTRAN +libMEFISTO2D_la_LDFLAGS += -lgfortran +else !USE_GFORTRAN +libMEFISTO2D_la_LDFLAGS += -lg2c +endif diff --git a/src/Makefile.in b/src/Makefile.am similarity index 73% rename from src/Makefile.in rename to src/Makefile.am index e9ce50778..350144b07 100644 --- a/src/Makefile.in +++ b/src/Makefile.am @@ -21,21 +21,29 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -@COMMENCE@ - -MED_CXXFLAGS=@MED_CXXFLAGS@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am SUBDIRS = \ - SMDS SMESHDS Controls Driver DriverMED DriverDAT DriverUNV DriverSTL \ - SMESH SMESH_I SMESHClient OBJECT SMESHFiltersSelection SMESHGUI SMESH_SWIG \ - MEFISTO2 StdMeshers StdMeshers_I StdMeshersGUI - -@MODULE@ + SMDS \ + SMESHDS \ + Controls \ + Driver \ + DriverMED \ + DriverDAT \ + DriverUNV \ + DriverSTL \ + SMESH \ + SMESH_I \ + SMESHClient \ + OBJECT \ + SMESHFiltersSelection \ + SMESHGUI \ + SMESH_SWIG \ + MEFISTO2 \ + StdMeshers \ + StdMeshers_I \ + StdMeshersGUI diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am new file mode 100644 index 000000000..23723718d --- /dev/null +++ b/src/OBJECT/Makefile.am @@ -0,0 +1,74 @@ +# SMESH OBJECT : interactive object for SMESH visualization +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SMESH + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + SMESH_Actor.h \ + SMESH_Object.h \ + SMESH_ObjectDef.h \ + SMESH_ActorUtils.h + + +# Libraries targets + +lib_LTLIBRARIES = libSMESHObject.la +dist_libSMESHObject_la_SOURCES = \ + SMESH_Object.cxx \ + SMESH_DeviceActor.cxx \ + SMESH_Actor.cxx \ + SMESH_ExtractGeometry.cxx \ + SMESH_ActorUtils.cxx + +libSMESHObject_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(VTK_INCLUDES) \ + $(CORBA_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(QT_INCLUDES) \ + -I$(srcdir)/../Controls \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHDS \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../DriverMED \ + -I$(srcdir)/../SMESH \ + -I$(srcdir)/../SMESHClient \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libSMESHObject_la_LDFLAGS = \ + ../SMESHClient/libSMESHClient.la \ + ../SMDS/libSMDS.la \ + ../Controls/libSMESHControls.la \ + $(GUI_LDFLAGS) -lSalomeApp lSalomeObject \ + $(CAS_KERNEL) \ + $(VTK_LIBS) diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in deleted file mode 100644 index 165f9ae5c..000000000 --- a/src/OBJECT/Makefile.in +++ /dev/null @@ -1,140 +0,0 @@ -# SMESH OBJECT : interactive object for SMESH visualization -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Module : SMESH - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl - -@COMMENCE@ - -EXPORT_HEADERS = \ - SMESH_Actor.h \ - SMESH_Object.h \ - SMESH_ObjectDef.h \ - SMESH_ActorUtils.h - - -# Libraries targets - -LIB = libSMESHObject.la -LIB_SRC = \ - SMESH_Object.cxx \ - SMESH_DeviceActor.cxx \ - SMESH_Actor.cxx \ - SMESH_ExtractGeometry.cxx \ - SMESH_ActorUtils.cxx - -LIB_CLIENT_IDL = SALOME_Exception.idl \ - SALOME_GenericObj.idl \ - SALOME_Comm.idl \ - SALOME_Component.idl \ - MED.idl \ - SMESH_Mesh.idl \ - SMESH_Group.idl \ - SALOMEDS.idl \ - SMESH_Gen.idl \ - GEOM_Gen.idl \ - SMESH_Hypothesis.idl - - -# Executables targets -BIN = -BIN_SRC = - -CPPFLAGS+= \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(OCC_INCLUDES) \ - $(VTK_INCLUDES) \ - $(BOOST_CPPFLAGS) \ - $(QT_INCLUDES) \ - $(MED_CXXFLAGS) -LDFLAGS+= \ - $(KERNEL_LDFLAGS) \ - $(GUI_LDFLAGS) \ - $(OCC_KERNEL_LIBS) \ - $(VTK_LIBS) \ - $(MED_LDFLAGS) \ - -lSMDS \ - -lSMESHClient \ - -lSalomeApp \ - -lSalomeObject \ - -lSMESHControls - -LDFLAGSFORBIN += \ - $(GEOM_LDFLAGS) \ - $(MED_LDFLAGS) \ - $(LDFLAGS) \ - -lqtx \ - -lsuit \ - -lstd \ - -lCAM \ - -lLightApp \ - -lObjBrowser \ - -lSalomePrs \ - -lSalomeDS \ - -lTOOLSDS \ - -lSalomeDSImpl \ - -lSalomeDSClient \ - -lSalomeHDFPersist \ - -lSalomeResourcesManager \ - -lSalomeLifeCycleCORBA \ - -lSalomeNotification \ - -lSalomeContainer \ - -lSalomeCatalog \ - -lSalomeSession \ - -lRegistry \ - -lNMTTools \ - -lNMTDS \ - -lmed_V2_1 \ - -lMEDWrapper \ - -lMEDWrapperBase \ - -lMEDWrapper_V2_1 \ - -lMEDWrapper_V2_2 \ - -lPlot2d \ - -lGLViewer \ - -lOCCViewer \ - -lVTKViewer \ - -lSVTK \ - -lSOCC \ - -lSPlot2d \ - -lSUPERVGraph \ - -lPyInterp \ - -lPythonConsole \ - -lLogWindow \ - -lLightApp \ - -lSalomeContainer \ - -lToolsGUI \ - -lSalomeNS \ - -lEvent \ - -lSalomeGenericObj \ - -lSALOMELocalTrace \ - -lwith_loggerTraceCollector \ - -lSALOMEBasics \ - -lOpUtil - -@CONCLUDE@ diff --git a/src/SMDS/Makefile.in b/src/SMDS/Makefile.am similarity index 83% rename from src/SMDS/Makefile.in rename to src/SMDS/Makefile.am index 01df90ab4..7e172f834 100644 --- a/src/SMDS/Makefile.in +++ b/src/SMDS/Makefile.am @@ -23,60 +23,13 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl -KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ - - -@COMMENCE@ - -# Libraries targets - -LIB = libSMDS.la -LIB_SRC = \ - SMDS_MeshObject.cxx \ - SMDS_MeshElement.cxx \ - SMDS_Position.cxx \ - SMDS_EdgePosition.cxx \ - SMDS_FacePosition.cxx \ - SMDS_SpacePosition.cxx \ - SMDS_VertexPosition.cxx \ - SMDS_MeshNode.cxx \ - SMDS_MeshEdge.cxx \ - SMDS_MeshFace.cxx \ - SMDS_MeshVolume.cxx \ - SMDS_MeshElementIDFactory.cxx \ - SMDS_MeshGroup.cxx \ - SMDS_MeshIDFactory.cxx \ - SMDS_Mesh.cxx \ - SMDS_IteratorOfElements.cxx \ - SMDS_VolumeOfFaces.cxx \ - SMDS_VolumeOfNodes.cxx \ - SMDS_PolyhedralVolumeOfNodes.cxx \ - SMDS_FaceOfEdges.cxx \ - SMDS_FaceOfNodes.cxx \ - SMDS_PolygonalFaceOfNodes.cxx \ - SMDS_VolumeTool.cxx \ - SMDS_QuadraticEdge.cxx \ - SMDS_QuadraticFaceOfNodes.cxx \ - SMDS_QuadraticVolumeOfNodes.cxx - - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = - -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= \ +salomeinclude_HEADERS = \ SMDS_TypeOfPosition.hxx \ SMDSAbs_ElementType.hxx \ SMDS_EdgePosition.hxx \ @@ -110,15 +63,44 @@ EXPORT_HEADERS= \ SMDS_SetIterator.hxx \ SMESH_SMDS.hxx -# additionnal information to compil and link file -CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS += $(KERNEL_LDFLAGS) $(OCC_KERNEL_LIBS) +# Libraries targets + +lib_LTLIBRARIES = libSMDS.la +dist_libSMDS_la_SOURCES = \ + SMDS_MeshObject.cxx \ + SMDS_MeshElement.cxx \ + SMDS_Position.cxx \ + SMDS_EdgePosition.cxx \ + SMDS_FacePosition.cxx \ + SMDS_SpacePosition.cxx \ + SMDS_VertexPosition.cxx \ + SMDS_MeshNode.cxx \ + SMDS_MeshEdge.cxx \ + SMDS_MeshFace.cxx \ + SMDS_MeshVolume.cxx \ + SMDS_MeshElementIDFactory.cxx \ + SMDS_MeshGroup.cxx \ + SMDS_MeshIDFactory.cxx \ + SMDS_Mesh.cxx \ + SMDS_IteratorOfElements.cxx \ + SMDS_VolumeOfFaces.cxx \ + SMDS_VolumeOfNodes.cxx \ + SMDS_PolyhedralVolumeOfNodes.cxx \ + SMDS_FaceOfEdges.cxx \ + SMDS_FaceOfNodes.cxx \ + SMDS_PolygonalFaceOfNodes.cxx \ + SMDS_VolumeTool.cxx \ + SMDS_QuadraticEdge.cxx \ + SMDS_QuadraticFaceOfNodes.cxx \ + SMDS_QuadraticVolumeOfNodes.cxx -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = +# additionnal information to compil and link file +libSMDS_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) -@CONCLUDE@ +libSMDS_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(CAS_KERNEL) diff --git a/src/SMESH/Makefile.in b/src/SMESH/Makefile.am similarity index 57% rename from src/SMESH/Makefile.in rename to src/SMESH/Makefile.am index b643a6d68..70dbb3f7a 100644 --- a/src/SMESH/Makefile.in +++ b/src/SMESH/Makefile.am @@ -23,18 +23,14 @@ # # File : Makefile.in # Author : Paul RASCLE, EDF +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ - -# header files -EXPORT_HEADERS= \ +# header files +salomeinclude_HEADERS = \ SMESH_Gen.hxx \ SMESH_Mesh.hxx \ SMESH_subMesh.hxx \ @@ -56,39 +52,51 @@ EXPORT_HEADERS= \ SMESH_MesherHelper.hxx \ SMESH_SMESH.hxx -EXPORT_PYSCRIPTS = - # Libraries targets -LIB= libSMESHimpl.la - -LIB_SRC = SMESH_Gen.cxx SMESH_Mesh.cxx SMESH_subMesh.cxx \ - SMESH_Hypothesis.cxx \ - SMESH_Algo.cxx \ - SMESH_1D_Algo.cxx \ - SMESH_2D_Algo.cxx \ - SMESH_3D_Algo.cxx \ - SMESH_Group.cxx \ - SMESH_MeshEditor.cxx \ - SMESH_Block.cxx \ - SMESH_Pattern.cxx \ - SMESH_HypoFilter.cxx \ - SMESH_MesherHelper.cxx - -LIB_SERVER_IDL = - -LIB_CLIENT_IDL = +lib_LTLIBRARIES = libSMESHimpl.la -# Executables targets -BIN = -BIN_SRC = +dist_libSMESHimpl_la_SOURCES = \ + SMESH_Gen.cxx \ + SMESH_Mesh.cxx \ + SMESH_subMesh.cxx \ + SMESH_Hypothesis.cxx \ + SMESH_Algo.cxx \ + SMESH_1D_Algo.cxx \ + SMESH_2D_Algo.cxx \ + SMESH_3D_Algo.cxx \ + SMESH_Group.cxx \ + SMESH_MeshEditor.cxx \ + SMESH_Block.cxx \ + SMESH_Pattern.cxx \ + SMESH_HypoFilter.cxx \ + SMESH_MesherHelper.cxx # additionnal information to compile and link file -CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) $(GEOM_CXX_FLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) $(GEOM_CXX_FLAGS) -LDFLAGS+= $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(MED_LDFLAGS) -lNMTTools -lSMESHDS -lMeshDriverDAT -lMeshDriverSTL -lMeshDriverMED -lMeshDriverUNV @CAS_LDPATH@ -lTKShHealing +libSMESHimpl_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GEOM_CXX_FLAGS) \ + $(BOOST_CPPFLAGS) \ + $(CAS_CPPFLAGS) \ + $(HDF5_CPPFLAGS) \ + -I$(srcdir)/../Controls \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../DriverDAT \ + -I$(srcdir)/../DriverMED \ + -I$(srcdir)/../DriverUNV \ + -I$(srcdir)/../DriverSTL \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHDS \ + -I$(top_builddir)/salome_adm/unix -@CONCLUDE@ +libSMESHimpl_la_LDFLAGS = \ + ../SMESHDS/libSMESHDS.la \ + ../Controls/libSMESHControls.la \ + ../DriverDAT/libMeshDriverDAT.la \ + ../DriverSTL/libMeshDriverSTL.la \ + ../DriverMED/libMeshDriverMED.la \ + ../DriverUNV/libMeshDriverUNV.la \ + $(GEOM_LDFLAGS) -lNMTTools \ + $(CAS_LDPATH) -lTKShHealing diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am new file mode 100644 index 000000000..47dcce8dc --- /dev/null +++ b/src/SMESHClient/Makefile.am @@ -0,0 +1,80 @@ +# GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Pavel TELKOV (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SHESM + + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + SMESH_Client.hxx + +# Libraries targets +lib_LTLIBRARIES = libSMESHClient.la +dist_libSMESHClient_la_SOURCES = \ + SMESH_Client.cxx + +# Executables targets +bin_PROGRAMS = SMESHClientBin +dist_SMESHClientBin_SOURCES = \ + SMESHClientBin.cxx + +# additionnal information to compil and link file +libSMESHClient_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(CAS_CPPFLAGS) \ + -I$(srcdir)/../Controls \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../DriverDAT \ + -I$(srcdir)/../DriverMED \ + -I$(srcdir)/../DriverUNV \ + -I$(srcdir)/../DriverSTL \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHDS \ + -I$(srcdir)/../SMESH \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libSMESHClient_la_LDFLAGS = \ + ../../idl/libSalomeIDLSMESH.la \ + ../SMDS/libSMDS.la \ + ../SMESH/libSMESHimpl.la \ + ../SMESHDS/libSMESHDS.la \ + ../Controls/libSMESHControls.la \ + $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \ + $(CAS_KERNEL) + +SMESHClientBin_CPPFLAGS = \ + $(libSMESHClient_la_CPPFLAGS) + +SMESHClientBin_LDADD = \ + $(libSMESHClient_la_LDFLAGS) + + diff --git a/src/SMESHClient/Makefile.in b/src/SMESHClient/Makefile.in deleted file mode 100644 index d367f0d27..000000000 --- a/src/SMESHClient/Makefile.in +++ /dev/null @@ -1,103 +0,0 @@ -# GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Pavel TELKOV (OCC) -# Module : SHESM - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS = \ - SMESH_Client.hxx - -# Libraries targets - -LIB = libSMESHClient.la -LIB_SRC = SMESH_Client.cxx - -LIB_CLIENT_IDL = SALOME_Comm.idl \ - SALOME_Component.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_Exception.idl \ - SALOME_GenericObj.idl \ - SMESH_Mesh.idl \ - SMESH_Gen.idl \ - SMESH_Group.idl \ - SMESH_Hypothesis.idl \ - SMESH_Pattern.idl \ - SMESH_Filter.idl \ - GEOM_Gen.idl \ - MED.idl - -# Executables targets -BIN = SMESHClientBin -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -# additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(OCC_KERNEL_LIBS) \ - $(KERNEL_LDFLAGS) \ - $(GEOM_LDFLAGS) \ - $(MED_LDFLAGS) \ - -lSMDS \ - -lSMESHimpl \ - -lSMESHDS \ - -lSMESHControls \ - -lNMTTools \ - -lNMTDS \ - -lmed_V2_1 \ - -lMEDWrapper \ - -lMEDWrapperBase \ - -lMEDWrapper_V2_1 \ - -lMEDWrapper_V2_2 \ - -lSalomeResourcesManager \ - -lSalomeLifeCycleCORBA \ - -lSalomeNotification \ - -lSalomeContainer \ - -lRegistry \ - -lSalomeNS \ - -lSALOMELocalTrace \ - -lSALOMEBasics \ - -lOpUtil \ - -lTKShHealing \ - -lMeshDriverDAT \ - -lMeshDriverSTL \ - -lMeshDriverMED \ - -lMeshDriverUNV \ - -lMeshDriver - -LDFLAGSFORBIN += $(LDFLAGS) - -@CONCLUDE@ - diff --git a/src/SMESHDS/Makefile.in b/src/SMESHDS/Makefile.am similarity index 76% rename from src/SMESHDS/Makefile.in rename to src/SMESHDS/Makefile.am index c1584c8e5..23da89e2e 100644 --- a/src/SMESHDS/Makefile.in +++ b/src/SMESHDS/Makefile.am @@ -23,41 +23,13 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libSMESHDS.la -LIB_SRC = \ - SMESHDS_Document.cxx \ - SMESHDS_Hypothesis.cxx \ - SMESHDS_Script.cxx \ - SMESHDS_Command.cxx \ - SMESHDS_SubMesh.cxx \ - SMESHDS_Mesh.cxx \ - SMESHDS_GroupBase.cxx \ - SMESHDS_Group.cxx \ - SMESHDS_GroupOnGeom.cxx - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = - -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= \ +salomeinclude_HEADERS = \ SMESHDS_Document.hxx \ SMESHDS_Hypothesis.hxx \ SMESHDS_Mesh.hxx \ @@ -71,15 +43,28 @@ EXPORT_HEADERS= \ SMESH_SMESHDS.hxx \ SMESHDS_DataMapOfShape.hxx -# additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(OCC_KERNEL_LIBS) -lSMDS +# Libraries targets +lib_LTLIBRARIES = libSMESHDS.la +dist_libSMESHDS_la_SOURCES = \ + SMESHDS_Document.cxx \ + SMESHDS_Hypothesis.cxx \ + SMESHDS_Script.cxx \ + SMESHDS_Command.cxx \ + SMESHDS_SubMesh.cxx \ + SMESHDS_Mesh.cxx \ + SMESHDS_GroupBase.cxx \ + SMESHDS_Group.cxx \ + SMESHDS_GroupOnGeom.cxx -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = +# additionnal information to compil and link file +libSMESHDS_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../SMDS -@CONCLUDE@ +libSMESHDS_la_LDFLAGS = \ + ../SMDS/libSMDS.la \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(CAS_KERNEL) -lTKBRep diff --git a/src/DriverDAT/Makefile.in b/src/SMESHFiltersSelection/Makefile.am similarity index 52% rename from src/DriverDAT/Makefile.in rename to src/SMESHFiltersSelection/Makefile.am index 59c7d3355..192973966 100644 --- a/src/DriverDAT/Makefile.in +++ b/src/SMESHFiltersSelection/Makefile.am @@ -1,4 +1,4 @@ -# SMESH DriverDAT : driver to read and write 'dat' files +# SMESH SMESHFiltersSelection : filter selector for viewer # # Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -22,40 +22,47 @@ # # # File : Makefile.in -# Author : Marc Tajchman (CEA) +# Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= DriverDAT_R_SMDS_Mesh.h DriverDAT_R_SMESHDS_Mesh.h DriverDAT_R_SMESHDS_Document.h DriverDAT_W_SMDS_Mesh.h DriverDAT_W_SMESHDS_Mesh.h DriverDAT_W_SMESHDS_Document.h SMESH_DriverDAT.hxx +salomeinclude_HEADERS = \ + SMESH_Type.h \ + SMESH_TypeFilter.hxx \ + SMESH_NumberFilter.hxx \ + SMESH_LogicalFilter.hxx # Libraries targets -LIB = libMeshDriverDAT.la -LIB_SRC = DriverDAT_R_SMDS_Mesh.cxx DriverDAT_R_SMESHDS_Mesh.cxx DriverDAT_R_SMESHDS_Document.cxx DriverDAT_W_SMDS_Mesh.cxx DriverDAT_W_SMESHDS_Mesh.cxx DriverDAT_W_SMESHDS_Document.cxx - -# Executables targets -BIN = DAT_Test -LIB_CLIENT_IDL = +lib_LTLIBRARIES = libSMESHFiltersSelection.la -LIB_SERVER_IDL = +dist_libSMESHFiltersSelection_la_SOURCES = \ + SMESH_TypeFilter.cxx \ + SMESH_NumberFilter.cxx \ + SMESH_LogicalFilter.cxx # additionnal information to compil and link file -CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS) - -LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics - -@CONCLUDE@ - +libSMESHFiltersSelection_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(CAS_CPPFLAGS) \ + $(QT_INCLUDES) \ + $(PYTHON_INCLUDES) \ + $(VTK_INCLUDES) \ + ${BOOST_CPPFLAGS} \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix +libSMESHFiltersSelection_la_LDFLAGS = \ + ../../idl/libSalomeIDLSMESH.la \ + $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS \ + $(GUI_LDFLAGS) -lSalomeApp -lsuit \ + $(GEOM_LDFLAGS) -lGEOM \ + $(OCC_KERNEL_LIBS) diff --git a/src/SMESHFiltersSelection/Makefile.in b/src/SMESHFiltersSelection/Makefile.in deleted file mode 100644 index c1e928244..000000000 --- a/src/SMESHFiltersSelection/Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ -# SMESH SMESHFiltersSelection : filter selector for viewer -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Patrick GOLDBRONN (CEA) -# Module : SMESH -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libSMESHFiltersSelection.la -LIB_SRC = SMESH_TypeFilter.cxx \ - SMESH_NumberFilter.cxx \ - SMESH_LogicalFilter.cxx - -LIB_CLIENT_IDL = SALOME_Comm.idl \ - SALOME_Exception.idl \ - GEOM_Gen.idl \ - SMESH_Gen.idl \ - SMESH_Mesh.idl \ - SMESH_Hypothesis.idl \ - SMESH_Group.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_ModuleCatalog.idl \ - SALOME_Component.idl \ - SMESH_Filter.idl \ - SMESH_Pattern.idl \ - SALOME_GenericObj.idl \ - MED.idl - -# header files -EXPORT_HEADERS= SMESH_Type.h \ - SMESH_TypeFilter.hxx \ - SMESH_NumberFilter.hxx \ - SMESH_LogicalFilter.hxx - -# additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) ${BOOST_CPPFLAGS} -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) -I${BOOSTDIR} -LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lSalomeDSClient -lSalomeDS $(GUI_LDFLAGS) $(GEOM_LDFLAGS) -lSalomeApp -lsuit - -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = - -@CONCLUDE@ diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am new file mode 100644 index 000000000..349f95dde --- /dev/null +++ b/src/SMESHGUI/Makefile.am @@ -0,0 +1,195 @@ +# SMESH SMESHGUI : GUI for SMESH component +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Nicolas REJNERI +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SMESH +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + SMESHGUI_Swig.hxx \ + SMESHGUI_Swig.i \ + SMESHGUI.h \ + SMESHGUI_Utils.h \ + SMESHGUI_Hypotheses.h \ + SMESHGUI_HypothesesUtils.h \ + SMESHGUI_SpinBox.h \ + SMESHGUI_Selection.h \ + SMESHGUI_VTKUtils.h \ + SMESH_SMESHGUI.hxx + +# Libraries targets +lib_LTLIBRARIES = libSMESH.la +dist_libSMESH_la_SOURCES = \ + SMESHGUI.cxx \ + SMESHGUI_PatternWidget.cxx \ + SMESHGUI_CreatePatternDlg.cxx \ + SMESHGUI_MeshPatternDlg.cxx \ + SMESHGUI_SpinBox.cxx \ + SMESHGUI_NodesDlg.cxx \ + SMESHGUI_TransparencyDlg.cxx \ + SMESHGUI_ClippingDlg.cxx \ + SMESHGUI_GroupDlg.cxx \ + SMESHGUI_RemoveNodesDlg.cxx \ + SMESHGUI_RemoveElementsDlg.cxx \ + SMESHGUI_MeshInfosDlg.cxx \ + SMESHGUI_StandardMeshInfosDlg.cxx \ + SMESHGUI_Preferences_ColorDlg.cxx \ + SMESHGUI_Preferences_ScalarBarDlg.cxx \ + SMESHGUI_Preferences_SelectionDlg.cxx \ + SMESHGUI_Swig.cxx \ + SMESHGUI_MoveNodesDlg.cxx \ + SMESHGUI_AddMeshElementDlg.cxx \ + SMESHGUI_XmlHandler.cxx \ + SMESHGUI_Filter.cxx \ + SMESHGUI_FilterDlg.cxx \ + SMESHGUI_FilterLibraryDlg.cxx \ + SMESHGUI_SingleEditDlg.cxx \ + SMESHGUI_MultiEditDlg.cxx \ + SMESHGUI_DeleteGroupDlg.cxx \ + SMESHGUI_GroupOpDlg.cxx \ + SMESHGUI_SmoothingDlg.cxx \ + SMESHGUI_RenumberingDlg.cxx \ + SMESHGUI_ExtrusionDlg.cxx \ + SMESHGUI_ExtrusionAlongPathDlg.cxx \ + SMESHGUI_RevolutionDlg.cxx \ + SMESHGUI_RotationDlg.cxx \ + SMESHGUI_TranslationDlg.cxx \ + SMESHGUI_SymmetryDlg.cxx \ + SMESHGUI_SewingDlg.cxx \ + SMESHGUI_MergeNodesDlg.cxx \ + SMESHGUI_EditMeshDlg.cxx \ + SMESHGUI_Utils.cxx \ + SMESHGUI_GEOMGenUtils.cxx \ + SMESHGUI_MeshUtils.cxx \ + SMESHGUI_GroupUtils.cxx \ + SMESHGUI_FilterUtils.cxx \ + SMESHGUI_PatternUtils.cxx \ + SMESHGUI_HypothesesUtils.cxx \ + SMESHGUI_VTKUtils.cxx \ + SMESHGUI_Selection.cxx \ + SMESHGUI_CreatePolyhedralVolumeDlg.cxx \ + SMESHGUI_Operation.cxx \ + SMESHGUI_SelectionOp.cxx \ + SMESHGUI_Dialog.cxx \ + SMESHGUI_MeshDlg.cxx \ + SMESHGUI_MeshOp.cxx \ + SMESHGUI_Displayer.cxx \ + SMESHGUI_Hypotheses.cxx \ + SMESHGUI_ShapeByMeshDlg.cxx \ + SMESHGUI_AddQuadraticElementDlg.cxx \ + SMESHGUI_ConvToQuadDlg.cxx \ + SMESHGUI_ConvToQuadOp.cxx + +MOC_FILES = \ + SMESHGUI_moc.cxx \ + SMESHGUI_PatternWidget_moc.cxx \ + SMESHGUI_MeshPatternDlg_moc.cxx \ + SMESHGUI_CreatePatternDlg_moc.cxx \ + SMESHGUI_NodesDlg_moc.cxx \ + SMESHGUI_SpinBox_moc.cxx \ + SMESHGUI_TransparencyDlg_moc.cxx \ + SMESHGUI_ClippingDlg_moc.cxx \ + SMESHGUI_GroupDlg_moc.cxx \ + SMESHGUI_RemoveNodesDlg_moc.cxx \ + SMESHGUI_RemoveElementsDlg_moc.cxx \ + SMESHGUI_MeshInfosDlg_moc.cxx \ + SMESHGUI_StandardMeshInfosDlg_moc.cxx \ + SMESHGUI_Preferences_ColorDlg_moc.cxx \ + SMESHGUI_Preferences_ScalarBarDlg_moc.cxx \ + SMESHGUI_Preferences_SelectionDlg_moc.cxx \ + SMESHGUI_MoveNodesDlg_moc.cxx \ + SMESHGUI_AddMeshElementDlg_moc.cxx \ + SMESHGUI_FilterDlg_moc.cxx \ + SMESHGUI_FilterLibraryDlg_moc.cxx \ + SMESHGUI_SingleEditDlg_moc.cxx \ + SMESHGUI_MultiEditDlg_moc.cxx \ + SMESHGUI_DeleteGroupDlg_moc.cxx \ + SMESHGUI_GroupOpDlg_moc.cxx \ + SMESHGUI_SmoothingDlg_moc.cxx \ + SMESHGUI_RenumberingDlg_moc.cxx \ + SMESHGUI_ExtrusionDlg_moc.cxx \ + SMESHGUI_ExtrusionAlongPathDlg_moc.cxx \ + SMESHGUI_RevolutionDlg_moc.cxx \ + SMESHGUI_RotationDlg_moc.cxx \ + SMESHGUI_TranslationDlg_moc.cxx \ + SMESHGUI_SymmetryDlg_moc.cxx \ + SMESHGUI_SewingDlg_moc.cxx \ + SMESHGUI_MergeNodesDlg_moc.cxx \ + SMESHGUI_EditMeshDlg_moc.cxx \ + SMESHGUI_CreatePolyhedralVolumeDlg_moc.cxx \ + SMESHGUI_Operation_moc.cxx \ + SMESHGUI_SelectionOp_moc.cxx \ + SMESHGUI_Dialog_moc.cxx \ + SMESHGUI_MeshDlg_moc.cxx \ + SMESHGUI_MeshOp_moc.cxx \ + SMESHGUI_Hypotheses_moc.cxx \ + SMESHGUI_ShapeByMeshDlg_moc.cxx \ + SMESHGUI_AddQuadraticElementDlg_moc.cxx \ + SMESHGUI_ConvToQuadDlg_moc.cxx \ + SMESHGUI_ConvToQuadOp_moc.cxx + +nodist_libSMESH_la_SOURCES= \ + $(MOC_FILES) + +# additionnal information to compil and link file +libSMESH_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(OGL_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../SMESHFiltersSelection \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESH \ + -I$(srcdir)/../SMESH_I \ + -I$(srcdir)/../Controls \ + -I$(srcdir)/../SMESHClient \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + + +libSMESH_la_LDFLAGS = \ + ../SMESHFiltersSelection/libSMESHFiltersSelection.la \ + ../SMDS/libSMDS.la \ + ../Controls/libSMESHControls.la \ + ../OBJECT/libSMESHObject.la \ + $(GEOM_LDFLAGS) \ + -lGEOMBase + +# resources files +nodist_salomeres_DATA= \ + SMESH_images.qm \ + SMESH_msg_en.qm diff --git a/src/SMESHGUI/Makefile.in b/src/SMESHGUI/Makefile.in deleted file mode 100644 index 87a8ed0fb..000000000 --- a/src/SMESHGUI/Makefile.in +++ /dev/null @@ -1,203 +0,0 @@ -# SMESH SMESHGUI : GUI for SMESH component -# -# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Nicolas REJNERI -# Module : SMESH -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= SMESHGUI_Swig.hxx \ - SMESHGUI_Swig.i \ - SMESHGUI.h \ - SMESHGUI_Utils.h \ - SMESHGUI_Hypotheses.h \ - SMESHGUI_HypothesesUtils.h \ - SMESHGUI_SpinBox.h \ - SMESHGUI_Selection.h \ - SMESHGUI_VTKUtils.h \ - SMESH_SMESHGUI.hxx - - -# .po files to transform in .qm -PO_FILES = \ - SMESH_images.po \ - SMESH_msg_en.po - -# Libraries targets -LIB = libSMESH.la -LIB_SRC = SMESHGUI.cxx \ - SMESHGUI_PatternWidget.cxx \ - SMESHGUI_CreatePatternDlg.cxx \ - SMESHGUI_MeshPatternDlg.cxx \ - SMESHGUI_SpinBox.cxx \ - SMESHGUI_NodesDlg.cxx \ - SMESHGUI_TransparencyDlg.cxx \ - SMESHGUI_ClippingDlg.cxx \ - SMESHGUI_GroupDlg.cxx \ - SMESHGUI_RemoveNodesDlg.cxx \ - SMESHGUI_RemoveElementsDlg.cxx \ - SMESHGUI_MeshInfosDlg.cxx \ - SMESHGUI_StandardMeshInfosDlg.cxx \ - SMESHGUI_Preferences_ColorDlg.cxx \ - SMESHGUI_Preferences_ScalarBarDlg.cxx \ - SMESHGUI_Preferences_SelectionDlg.cxx \ - SMESHGUI_Swig.cxx \ - SMESHGUI_MoveNodesDlg.cxx \ - SMESHGUI_AddMeshElementDlg.cxx \ - SMESHGUI_XmlHandler.cxx \ - SMESHGUI_Filter.cxx \ - SMESHGUI_FilterDlg.cxx \ - SMESHGUI_FilterLibraryDlg.cxx \ - SMESHGUI_SingleEditDlg.cxx \ - SMESHGUI_MultiEditDlg.cxx \ - SMESHGUI_DeleteGroupDlg.cxx \ - SMESHGUI_GroupOpDlg.cxx \ - SMESHGUI_SmoothingDlg.cxx \ - SMESHGUI_RenumberingDlg.cxx \ - SMESHGUI_ExtrusionDlg.cxx \ - SMESHGUI_ExtrusionAlongPathDlg.cxx \ - SMESHGUI_RevolutionDlg.cxx \ - SMESHGUI_RotationDlg.cxx \ - SMESHGUI_TranslationDlg.cxx \ - SMESHGUI_SymmetryDlg.cxx \ - SMESHGUI_SewingDlg.cxx \ - SMESHGUI_MergeNodesDlg.cxx \ - SMESHGUI_EditMeshDlg.cxx \ - SMESHGUI_Utils.cxx \ - SMESHGUI_GEOMGenUtils.cxx \ - SMESHGUI_MeshUtils.cxx \ - SMESHGUI_GroupUtils.cxx \ - SMESHGUI_FilterUtils.cxx \ - SMESHGUI_PatternUtils.cxx \ - SMESHGUI_HypothesesUtils.cxx \ - SMESHGUI_VTKUtils.cxx \ - SMESHGUI_Selection.cxx \ - SMESHGUI_CreatePolyhedralVolumeDlg.cxx \ - SMESHGUI_Operation.cxx \ - SMESHGUI_SelectionOp.cxx \ - SMESHGUI_Dialog.cxx \ - SMESHGUI_MeshDlg.cxx \ - SMESHGUI_MeshOp.cxx \ - SMESHGUI_Displayer.cxx \ - SMESHGUI_Hypotheses.cxx \ - SMESHGUI_ShapeByMeshDlg.cxx \ - SMESHGUI_AddQuadraticElementDlg.cxx \ - SMESHGUI_ConvToQuadDlg.cxx \ - SMESHGUI_ConvToQuadOp.cxx - -LIB_MOC = \ - SMESHGUI.h \ - SMESHGUI_PatternWidget.h \ - SMESHGUI_MeshPatternDlg.h \ - SMESHGUI_CreatePatternDlg.h \ - SMESHGUI_NodesDlg.h \ - SMESHGUI_SpinBox.h \ - SMESHGUI_TransparencyDlg.h \ - SMESHGUI_ClippingDlg.h \ - SMESHGUI_GroupDlg.h \ - SMESHGUI_RemoveNodesDlg.h \ - SMESHGUI_RemoveElementsDlg.h \ - SMESHGUI_MeshInfosDlg.h \ - SMESHGUI_StandardMeshInfosDlg.h \ - SMESHGUI_Preferences_ColorDlg.h \ - SMESHGUI_Preferences_ScalarBarDlg.h \ - SMESHGUI_Preferences_SelectionDlg.h \ - SMESHGUI_MoveNodesDlg.h \ - SMESHGUI_AddMeshElementDlg.h \ - SMESHGUI_FilterDlg.h \ - SMESHGUI_FilterLibraryDlg.h \ - SMESHGUI_SingleEditDlg.h \ - SMESHGUI_MultiEditDlg.h \ - SMESHGUI_DeleteGroupDlg.h \ - SMESHGUI_GroupOpDlg.h \ - SMESHGUI_SmoothingDlg.h \ - SMESHGUI_RenumberingDlg.h \ - SMESHGUI_ExtrusionDlg.h \ - SMESHGUI_ExtrusionAlongPathDlg.h \ - SMESHGUI_RevolutionDlg.h \ - SMESHGUI_RotationDlg.h \ - SMESHGUI_TranslationDlg.h \ - SMESHGUI_SymmetryDlg.h \ - SMESHGUI_SewingDlg.h \ - SMESHGUI_MergeNodesDlg.h \ - SMESHGUI_EditMeshDlg.h \ - SMESHGUI_CreatePolyhedralVolumeDlg.h \ - SMESHGUI_Operation.h \ - SMESHGUI_SelectionOp.h \ - SMESHGUI_Dialog.h \ - SMESHGUI_MeshDlg.h \ - SMESHGUI_MeshOp.h \ - SMESHGUI_Hypotheses.h \ - SMESHGUI_ShapeByMeshDlg.h \ - SMESHGUI_AddQuadraticElementDlg.h \ - SMESHGUI_ConvToQuadDlg.h \ - SMESHGUI_ConvToQuadOp.h - - -LIB_CLIENT_IDL = SALOME_Exception.idl \ - GEOM_Gen.idl \ - SMESH_Gen.idl \ - SMESH_Mesh.idl \ - SMESH_Hypothesis.idl \ - SMESH_Group.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_ModuleCatalog.idl \ - SALOME_Component.idl \ - MED.idl \ - SMESH_Filter.idl \ - SMESH_Pattern.idl \ - SALOME_GenericObj.idl \ - SALOME_Comm.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -#BIN = SMESHBin - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \ - $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) $(BOOST_CPPFLAGS) - -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ - $(GEOM_CXXFLAGS) - -LDFLAGS += -lSMESHObject -lSMESHFiltersSelection -lSMDS -lSMESHControls -lDlgRef \ - $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) \ - -lVTKViewer -lSalomeDSClient -lSalomeDS -lSalomeApp -lSalomePrs -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject \ - -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer $(GEOM_LDFLAGS) -lGEOM -lGEOMClient \ - -lGEOMBase -lGEOMObject -lGEOMFiltersSelection -lSalomeSession - -LDFLAGSFORBIN += $(LDFLAGS) - -@CONCLUDE@ diff --git a/src/SMESH_I/Makefile.in b/src/SMESH_I/Makefile.am similarity index 58% rename from src/SMESH_I/Makefile.in rename to src/SMESH_I/Makefile.am index 2558e560f..b306f5916 100644 --- a/src/SMESH_I/Makefile.in +++ b/src/SMESH_I/Makefile.am @@ -23,20 +23,14 @@ # # File : Makefile.in # Author : Paul RASCLE, EDF +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ +include $(top_srcdir)/adm_local/unix/make_common_starter.am -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl: - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= \ +# header files +salomeinclude_HEADERS = \ SMESH_Gen_i.hxx \ SMESH_Algo_i.hxx \ SMESH_1D_Algo_i.hxx \ @@ -48,13 +42,15 @@ EXPORT_HEADERS= \ SMESH_PythonDump.hxx \ SMESH.hxx -EXPORT_PYSCRIPTS = smeshpy.py +# Scripts to be installed. +dist_salomescript_DATA= \ + smeshpy.py # Libraries targets -LIB= libSMESHEngine.la +lib_LTLIBRARIES = libSMESHEngine.la -LIB_SRC = \ +dist_libSMESHEngine_la_SOURCES = \ SMESH_Gen_i.cxx \ SMESH_Gen_i_1.cxx \ SMESH_DumpPython.cxx \ @@ -74,46 +70,34 @@ LIB_SRC = \ SMESH_Pattern_i.cxx \ SMESH_2smeshpy.cxx -LIB_SERVER_IDL = \ - SMESH_Gen.idl \ - SMESH_Hypothesis.idl \ - SMESH_Mesh.idl \ - SALOME_Component.idl \ - SALOME_Exception.idl \ - SMESH_Filter.idl \ - SMESH_Group.idl \ - SMESH_Pattern.idl - -LIB_CLIENT_IDL = \ - SALOMEDS.idl \ - GEOM_Gen.idl \ - MED.idl \ - SALOMEDS_Attributes.idl \ - SALOME_GenericObj.idl \ - SALOME_Comm.idl - # Executables targets -BIN = SMESHEngine -BIN_SRC = +bin_PROGRAMS = SMESHEngine + +dist_SMESHEngine_SOURCES = \ + SMESHEngine.cxx # additionnal information to compil and link file -CPPFLAGS+= \ - $(OCC_INCLUDES) \ +libSMESHEngine_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(HDF5_INCLUDES) \ $(BOOST_CPPFLAGS) \ $(KERNEL_CXXFLAGS) \ $(MED_CXXFLAGS) \ - $(GEOM_CXXFLAGS) - -CXXFLAGS+= \ - $(OCC_INCLUDES) \ - $(OCC_CXXFLAGS) \ - $(HDF5_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(MED_CXXFLAGS) \ - $(GEOM_CXXFLAGS) - -LDFLAGS+= \ + $(GEOM_CXXFLAGS) \ + -I$(srcdir)/../Controls \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHDS \ + -I$(srcdir)/../Driver \ + -I$(srcdir)/../DriverMED \ + -I$(srcdir)/../SMESH \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + + +libSMESHEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLSMESH.la \ + ../SMESH/libSMESHimpl.la \ + ../Controls/libSMESHControls.la \ $(KERNEL_LDFLAGS) \ -lSalomeContainer \ -lSalomeNS \ @@ -124,50 +108,15 @@ LDFLAGS+= \ -lSalomeGenericObj \ $(GEOM_LDFLAGS) \ -lGEOMClient \ - -lSMESHimpl \ - -lSMESHControls \ $(OCC_LDPATH) \ -lTKCDF \ -lTKBO \ - -lTKShHealing + -lTKShHealing \ + $(CORBA_LIBS) -LDFLAGSFORBIN+= \ - -lSMDS \ - -lSMESHDS \ - $(MED_LDFLAGS) \ - -lMEDWrapper \ - -lMEDWrapperBase \ - -lMEDWrapper_V2_1 \ - -lMEDWrapper_V2_2 \ - -lmed_V2_1 \ - -lMeshDriver \ - -lMeshDriverMED \ - -lMeshDriverUNV \ - -lMeshDriverDAT \ - -lMeshDriverSTL \ - $(KERNEL_LDFLAGS) \ - -lSalomeContainer \ - -lSalomeNS \ - -lRegistry \ - -lSalomeResourcesManager \ - -lOpUtil \ - -lSALOMELocalTrace \ - -lSALOMEBasics \ - -lSalomeNotification \ - -lSalomeHDFPersist \ - -lSalomeLifeCycleCORBA \ - -lTOOLSDS \ - -lSalomeGenericObj \ - $(GEOM_LDFLAGS) \ - -lGEOMClient \ - -lSMESHimpl \ - -lSMESHControls \ - -lNMTTools \ - -lNMTDS \ - $(OCC_LDPATH) \ - -lTKCDF \ - -lTKBO \ - -lTKMath \ - -lTKShHealing -@CONCLUDE@ +SMESHEngine_CPPFLAGS = \ + $(libSMESHEngine_la_CPPFLAGS) + +SMESHEngine_LDADD = \ + $(libSMESHEngine_la_LDFLAGS) diff --git a/src/SMESH_SWIG/Makefile.am b/src/SMESH_SWIG/Makefile.am new file mode 100644 index 000000000..e3a8f92e7 --- /dev/null +++ b/src/SMESH_SWIG/Makefile.am @@ -0,0 +1,178 @@ +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Nicolas REJNERI, Paul RASCLE +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SMESH +# $Header$ + +include $(top_srcdir)/adm_local/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_LifeCycleCORBA.i -- swig --> swig_wrap.cpp +# libSALOME_Swig.py +# +# Step 2: build the dynamic library from cpp built source files and +# dependant libraries. +# +# swig_wrap.cpp -- gcc --> swig_wrap.o |-- link --> _libSALOME_Swig.la +# + | +# dependant libs | +# +# The file libSALOME_Swigcmodule.py will be installed in +# /lib/python/site-package/salome. +# The library will be installed in the same place. +# + +# this option puts it to dist +#BUILT_SOURCES = swig_wrap.cpp + +SWIG_FLAGS = \ + @SWIG_FLAGS@ \ + -I$(srcdir) \ + -I$(srcdir)/../SMESHGUI + +SWIG_SOURCES = libSMESH_Swig.i + +# Libraries targets + +lib_LTLIBRARIES = libSMESH_Swigcmodule.la + +nodist_pkgpython_DATA = libSMESH_Swig.py +libSMESH_Swig.py: swig_wrap.cpp + +libSMESH_Swigcmodule_la_SOURCES = \ + $(BUILT_SOURCES) \ + $(SWIG_SOURCES) \ + ../SMESHGUI/SMESHGUI_Swig.cxx + +nodist_libSMESH_Swigcmodule_la_SOURCES = \ + swig_wrap.cpp + +libSMESH_Swigcmodule_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(VTK_INCLUDES) \ + $(OGL_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../SMESHGUI \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libSMESH_Swigcmodule_la_LDFLAGS = \ + ../SMESHGUI/libSMESH.la \ + $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSALOMELocalTrace \ + $(GUI_LDFLAGS) -lCAM -lsuit -lqtx -lSalomeApp -lstd -lEvent \ + $(PYTHON_LIBS) \ + $(QT_MT_LIBS) + + +swig_wrap.cpp : $(SWIG_SOURCES) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +CLEANFILES = \ + swig_wrap.cpp + +# Scripts to be installed. +dist_salomescript_DATA= \ + libSMESH_Swig.py \ + smesh.py \ + batchmode_smesh.py \ + batchmode_mefisto.py \ + ex00_all.py \ + ex01_cube2build.py \ + ex02_cube2primitive.py \ + ex03_cube2partition.py \ + ex04_cube5tetraHexa.py \ + ex05_hole1build.py \ + ex06_hole1boolean.py \ + ex07_hole1partition.py \ + ex08_hole2build.py \ + ex09_grid4build.py \ + ex10_grid4geometry.py \ + ex11_grid3partition.py \ + ex12_grid17partition.py \ + ex13_hole1partial.py \ + ex14_cyl1holed.py \ + ex15_cyl2geometry.py \ + ex16_cyl2complementary.py \ + ex17_dome1.py \ + ex18_dome2.py \ + ex19_sphereINcube.py \ + ex21_lamp.py \ + SMESH_test.py\ + SMESH_test0.py\ + SMESH_test1.py \ + SMESH_test1_AndDisplay.py \ + SMESH_test2.py \ + SMESH_test3.py \ + SMESH_test4.py \ + SMESH_test5.py \ + SMESH_mechanic.py \ + SMESH_mechanic_tetra.py \ + SMESH_mechanic_editor.py \ + SMESH_mechanic_netgen.py \ + SMESH_fixation.py \ + SMESH_fixation_hexa.py \ + SMESH_fixation_tetra.py \ + SMESH_fixation_netgen.py \ + SMESH_box_tetra.py \ + SMESH_box2_tetra.py \ + SMESH_box3_tetra.py \ + SMESH_flight_skin.py \ + SMESH_Partition1_tetra.py\ + SMESH_controls.py \ + SMESH_freebord.py \ + SMESH_blocks.py \ + SMESH_BelongToGeom.py \ + SMESH_GroupFromGeom2.py \ + SMESH_box.py \ + SMESH_demo_hexa2_upd.py \ + SMESH_hexaedre.py \ + SMESH_Sphere.py \ + SMESH_GroupFromGeom.py \ + SMESH_Nut.py \ + SMESH_GroupLyingOnGeom.py \ + PAL_MESH_041_mesh.py \ + PAL_MESH_043_2D.py \ + PAL_MESH_043_3D.py \ + SMESH_reg.py + +EXPORT_SHAREDPYSCRIPTS = \ + SMESH_shared_modules.py + +install-exec-hook: $(libdir)/_libSMESH_Swig.so + +$(libdir)/_libSMESH_Swig.so: + ln -sf $(libdir)/libSMESH_Swigcmodule.so $@ diff --git a/src/SMESH_SWIG/Makefile.in b/src/SMESH_SWIG/Makefile.in deleted file mode 100644 index 80ba78e72..000000000 --- a/src/SMESH_SWIG/Makefile.in +++ /dev/null @@ -1,124 +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.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Nicolas REJNERI, Paul RASCLE -# Module : SMESH -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libSMESH_Swigcmodule.la -LIB_SRC = - -SWIG_DEF = libSMESH_Swig.i -EXPORT_PYSCRIPTS = libSMESH_Swig.py \ - smesh.py \ - batchmode_smesh.py \ - batchmode_mefisto.py \ - ex00_all.py \ - ex01_cube2build.py \ - ex02_cube2primitive.py \ - ex03_cube2partition.py \ - ex04_cube5tetraHexa.py \ - ex05_hole1build.py \ - ex06_hole1boolean.py \ - ex07_hole1partition.py \ - ex08_hole2build.py \ - ex09_grid4build.py \ - ex10_grid4geometry.py \ - ex11_grid3partition.py \ - ex12_grid17partition.py \ - ex13_hole1partial.py \ - ex14_cyl1holed.py \ - ex15_cyl2geometry.py \ - ex16_cyl2complementary.py \ - ex17_dome1.py \ - ex18_dome2.py \ - ex19_sphereINcube.py \ - ex21_lamp.py \ - SMESH_test.py\ - SMESH_test0.py\ - SMESH_test1.py \ - SMESH_test1_AndDisplay.py \ - SMESH_test2.py \ - SMESH_test3.py \ - SMESH_test4.py \ - SMESH_test5.py \ - SMESH_mechanic.py \ - SMESH_mechanic_tetra.py \ - SMESH_mechanic_editor.py \ - SMESH_mechanic_netgen.py \ - SMESH_fixation.py \ - SMESH_fixation_hexa.py \ - SMESH_fixation_tetra.py \ - SMESH_fixation_netgen.py \ - SMESH_box_tetra.py \ - SMESH_box2_tetra.py \ - SMESH_box3_tetra.py \ - SMESH_flight_skin.py \ - SMESH_Partition1_tetra.py\ - SMESH_controls.py \ - SMESH_freebord.py \ - SMESH_blocks.py \ - SMESH_BelongToGeom.py \ - SMESH_GroupFromGeom2.py \ - SMESH_box.py \ - SMESH_demo_hexa2_upd.py \ - SMESH_hexaedre.py \ - SMESH_Sphere.py \ - SMESH_GroupFromGeom.py \ - SMESH_Nut.py \ - SMESH_GroupLyingOnGeom.py \ - PAL_MESH_041_mesh.py \ - PAL_MESH_043_2D.py \ - PAL_MESH_043_3D.py \ - SMESH_reg.py - -LIB_CLIENT_IDL = SALOMEDS.idl \ - SALOME_Exception.idl \ - GEOM_Gen.idl \ - SMESH_Gen.idl \ - SMESH_Mesh.idl \ - SMESH_Hypothesis.idl \ - SMESH_BasicHypothesis.idl \ - SMESH_Group.idl \ - SALOME_ModuleCatalog.idl \ - SALOME_Component.idl \ - SALOME_GenericObj.idl \ - MED.idl \ - SALOME_Comm.idl - -EXPORT_SHAREDPYSCRIPTS=SMESH_shared_modules.py - -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H -LIBS+= $(PYTHON_LIBS) -LDFLAGS+= -lSMESH $(KERNEL_LDFLAGS) -lSalomeGenericObj - -@CONCLUDE@ diff --git a/src/StdMeshers/Makefile.in b/src/StdMeshers/Makefile.am similarity index 81% rename from src/StdMeshers/Makefile.in rename to src/StdMeshers/Makefile.am index 87f327472..6fceffabf 100644 --- a/src/StdMeshers/Makefile.in +++ b/src/StdMeshers/Makefile.am @@ -22,18 +22,13 @@ # # File : Makefile.in # Author : Julia DOROVSKIKH +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -# header files -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ StdMeshers_LocalLength.hxx \ StdMeshers_StartEndLength.hxx \ StdMeshers_Arithmetic1D.hxx \ @@ -65,13 +60,11 @@ EXPORT_HEADERS = \ StdMeshers_LayerDistribution.hxx \ SMESH_StdMeshers.hxx -EXPORT_PYSCRIPTS = - # Libraries targets -LIB = libStdMeshers.la +lib_LTLIBRARIES = libStdMeshers.la -LIB_SRC = \ +dist_libStdMeshers_la_SOURCES = \ StdMeshers_LocalLength.cxx \ StdMeshers_StartEndLength.cxx \ StdMeshers_Arithmetic1D.cxx \ @@ -103,31 +96,22 @@ LIB_SRC = \ StdMeshers_ProjectionUtils.cxx \ StdMeshers_LayerDistribution.cxx -LIB_SERVER_IDL = - -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - # additionnal information to compil and link file -CPPFLAGS+= \ - $(OCC_INCLUDES) \ +libStdMeshers_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) - -CXXFLAGS+= \ - $(OCC_CXXFLAGS) \ $(KERNEL_CXXFLAGS) \ - $(GEOM_CXXFLAGS) - -LDFLAGS+= \ - -lSMESHimpl \ - -lMEFISTO2D \ - $(OCC_LDPATH) \ - -lTKAdvTools \ - $(KERNEL_LDFLAGS) \ - $(GEOM_LDFLAGS) + -I$(srcdir)/../SMESHImpl \ + -I$(srcdir)/../MEFISTO2 \ + -I$(srcdir)/../SMESH \ + -I$(srcdir)/../SMESHDS \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../Controls -@CONCLUDE@ +libStdMeshers_la_LDFLAGS = \ + ../SMESH/libSMESHimpl.la \ + ../SMESH_I/libSMESHEngine.la \ + ../SMESHDS/libSMESHDS.la \ + ../MEFISTO2/libMEFISTO2D.la \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lOpUtil \ + $(OCC_LDPATH) -lTKAdvTools -lTKTopAlgo -lTKG3d diff --git a/src/StdMeshersGUI/Makefile.am b/src/StdMeshersGUI/Makefile.am new file mode 100644 index 000000000..76f0ab19b --- /dev/null +++ b/src/StdMeshersGUI/Makefile.am @@ -0,0 +1,95 @@ +# SMESH StdMeshersGUI : GUI for StdMeshers plugin +# +# Copyright (C) 2003 CEA +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : Makefile.in +# Author : Julia DOROVSKIKH +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : SMESH + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + StdMeshersGUI_StdHypothesisCreator.h + +# Libraries targets +lib_LTLIBRARIES = libStdMeshersGUI.la +dist_libStdMeshersGUI_la_SOURCES = \ + StdMeshersGUI.cxx \ + StdMeshersGUI_StdHypothesisCreator.cxx \ + StdMeshersGUI_DistrPreview.cxx \ + StdMeshersGUI_DistrTable.cxx \ + StdMeshersGUI_NbSegmentsCreator.cxx \ + StdMeshersGUI_ObjectReferenceParamWdg.cxx \ + StdMeshersGUI_LayerDistributionParamWdg.cxx + +MOC_FILES = \ + StdMeshersGUI_StdHypothesisCreator_moc.cxx \ + StdMeshersGUI_DistrPreview_moc.cxx \ + StdMeshersGUI_DistrTable_moc.cxx \ + StdMeshersGUI_NbSegmentsCreator_moc.cxx \ + StdMeshersGUI_ObjectReferenceParamWdg_moc.cxx \ + StdMeshersGUI_LayerDistributionParamWdg_moc.cxx + +nodist_libStdMeshersGUI_la_SOURCES= \ + $(MOC_FILES) + +# additionnal information to compil and link file +libStdMeshersGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(QWT_INCLUDES) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../SMESH \ + -I$(srcdir)/../SMESH_I \ + -I$(srcdir)/../SMESHDS \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../SMESHGUI \ + -I$(srcdir)/../Controls \ + -I$(srcdir)/../StdMeshers \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../SMESHFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + + +libStdMeshersGUI_la_LDFLAGS = \ + ../../idl/libSalomeIDLSMESH.la \ + ../SMESHFiltersSelection/libSMESHFiltersSelection.la \ + ../SMESHGUI/libSMESH.la \ + ../OBJECT/libSMESHObject.la \ + $(GUI_LDFLAGS) -lSalomeApp \ + $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools \ + $(QWT_LIBS) + +# resources files +nodist_salomeres_DATA= \ + StdMeshers_images.qm \ + StdMeshers_msg_en.qm diff --git a/src/StdMeshersGUI/Makefile.in b/src/StdMeshersGUI/Makefile.in deleted file mode 100644 index d84f17c24..000000000 --- a/src/StdMeshersGUI/Makefile.in +++ /dev/null @@ -1,91 +0,0 @@ -# SMESH StdMeshersGUI : GUI for StdMeshers plugin -# -# Copyright (C) 2003 CEA -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Julia DOROVSKIKH -# Module : SMESH - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${KERNEL_ROOT_DIR}/idl/salome:${MED_ROOT_DIR}/idl/salome - - -@COMMENCE@ - -# .po files to transform in .qm - PO_FILES = \ - StdMeshers_images.po \ - StdMeshers_msg_en.po - -# Libraries targets -LIB = libStdMeshersGUI.la -LIB_SRC = \ - StdMeshersGUI.cxx \ - StdMeshersGUI_StdHypothesisCreator.cxx \ - StdMeshersGUI_DistrPreview.cxx \ - StdMeshersGUI_DistrTable.cxx \ - StdMeshersGUI_NbSegmentsCreator.cxx \ - StdMeshersGUI_ObjectReferenceParamWdg.cxx \ - StdMeshersGUI_LayerDistributionParamWdg.cxx - -LIB_MOC = \ - StdMeshersGUI_StdHypothesisCreator.h \ - StdMeshersGUI_DistrPreview.h \ - StdMeshersGUI_DistrTable.h \ - StdMeshersGUI_NbSegmentsCreator.h \ - StdMeshersGUI_ObjectReferenceParamWdg.h \ - StdMeshersGUI_LayerDistributionParamWdg.h - -EXPORT_HEADERS = StdMeshersGUI_StdHypothesisCreator.h - -LIB_CLIENT_IDL = \ - SALOME_Exception.idl \ - SMESH_Hypothesis.idl \ - SMESH_BasicHypothesis.idl \ - SMESH_Mesh.idl - -## pb in dependencies search -LIB_CLIENT_IDL += \ - SALOME_Comm.idl \ - SALOMEDS.idl \ - SALOME_GenericObj.idl \ - SALOME_ContainerManager.idl \ - SALOME_Component.idl \ - GEOM_Gen.idl \ - MED.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \ - $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) \ - $(BOOST_CPPFLAGS) $(QWT_INCLUDES) - -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) - -LDFLAGS += -lSMESH -lVTKViewer -lSalomeApp -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \ - -lTKBO $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(GUI_LDFLAGS) \ - $(QWT_LIBS) - -@CONCLUDE@ diff --git a/src/StdMeshers_I/Makefile.in b/src/StdMeshers_I/Makefile.am similarity index 74% rename from src/StdMeshers_I/Makefile.in rename to src/StdMeshers_I/Makefile.am index cc278a74d..5939cb4da 100644 --- a/src/StdMeshers_I/Makefile.in +++ b/src/StdMeshers_I/Makefile.am @@ -22,21 +22,14 @@ # # File : Makefile.in # Author : Julia DOROVSKIKH +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : SMESH # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -# EXPORT_PYSCRIPTS = smeshpy.py SMESH_test.py - -# header files -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ StdMeshers_LocalLength_i.hxx \ StdMeshers_StartEndLength_i.hxx \ StdMeshers_Arithmetic1D_i.hxx \ @@ -65,10 +58,9 @@ EXPORT_HEADERS = \ SMESH_StdMeshers_I.hxx # Libraries targets +lib_LTLIBRARIES = libStdMeshersEngine.la -LIB= libStdMeshersEngine.la - -LIB_SRC = \ +dist_libStdMeshersEngine_la_SOURCES = \ StdMeshers_i.cxx \ StdMeshers_LocalLength_i.cxx \ StdMeshers_StartEndLength_i.cxx \ @@ -96,25 +88,34 @@ LIB_SRC = \ StdMeshers_ObjRefUlils.cxx \ StdMeshers_LayerDistribution_i.cxx -LIB_SERVER_IDL = SMESH_BasicHypothesis.idl - -LIB_CLIENT_IDL = \ - SALOMEDS.idl SALOME_Exception.idl \ - GEOM_Gen.idl MED.idl SALOMEDS_Attributes.idl \ - SMESH_Gen.idl SMESH_Hypothesis.idl SMESH_Group.idl \ - SALOME_Comm.idl SALOME_Component.idl SALOME_GenericObj.idl SMESH_Mesh.idl - -# Executables targets -BIN = -BIN_SRC = - # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ - $(GEOM_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) $(GEOM_CXXFLAGS) - -#IDLCXXFLAGS+= -Wbtp +libStdMeshersEngine_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(HDF5_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GEOM_CXXFLAGS) \ + $(MED_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../SMESHImpl \ + -I$(srcdir)/../MEFISTO2 \ + -I$(srcdir)/../SMESH \ + -I$(srcdir)/../SMESH_I \ + -I$(srcdir)/../SMESHDS \ + -I$(srcdir)/../SMDS \ + -I$(srcdir)/../Controls \ + -I$(srcdir)/../StdMeshers \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine $(KERNEL_LDFLAGS) -@CONCLUDE@ +libStdMeshersEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLSMESH.la \ + ../StdMeshers/libStdMeshers.la \ + ../SMESH_I/libSMESHEngine.la \ + ../SMESH/libSMESHimpl.la \ + ../SMESHDS/libSMESHDS.la \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace -lSalomeGenericObj \ + $(HDF5_LIBS) \ + $(CAS_LDPATH) -lTKBRep -lTKG3d -- 2.39.2