From fb35bf812dbe58da639cab14711f98c48a64d00c Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 13 Apr 2007 13:51:12 +0000 Subject: [PATCH] Using AutoTools for building procedure --- AUTHORS | 0 COPYING | 504 ++++++++++++++++++ ChangeLog | 0 doc/Makefile.in => Makefile.am | 57 +- 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 | 276 ---------- adm_local/unix/make_common_starter.am | 54 ++ adm_local/unix/make_omniorb.in | 56 -- bin/Makefile.am | 35 ++ build_configure | 246 +++------ configure.in.base => configure.ac | 180 ++++--- adm_local/Makefile.in => doc/Makefile.am | 48 +- doc/salome/Makefile.am | 42 ++ doc/salome/Makefile.in | 74 --- doc/salome/gui/{Makefile.in => Makefile.am} | 19 +- doc/salome/tui/Makefile.am | 57 ++ doc/salome/tui/Makefile.in | 95 ---- idl/Makefile.am | 103 ++++ idl/Makefile.in | 90 ---- Makefile.in => resources/Makefile.am | 103 +--- src/ARCHIMEDE/{Makefile.in => Makefile.am} | 42 +- .../Makefile.in => BREPExport/Makefile.am} | 29 +- src/BREPImport/{Makefile.in => Makefile.am} | 29 +- src/BasicGUI/Makefile.am | 100 ++++ src/BasicGUI/Makefile.in | 80 --- src/BlocksGUI/{Makefile.in => Makefile.am} | 65 ++- src/BooleanGUI/{Makefile.in => Makefile.am} | 55 +- src/BuildGUI/Makefile.am | 87 +++ src/BuildGUI/Makefile.in | 71 --- src/DisplayGUI/{Makefile.in => Makefile.am} | 52 +- src/DlgRef/Makefile.am | 217 ++++++++ src/DlgRef/Makefile.in | 164 ------ src/EntityGUI/Makefile.am | 110 ++++ src/EntityGUI/Makefile.in | 88 --- src/GEOM/Makefile.am | 81 +++ src/GEOM/Makefile.in | 78 --- src/GEOMAlgo/{Makefile.in => Makefile.am} | 34 +- src/GEOMBase/Makefile.am | 92 ++++ src/GEOMBase/Makefile.in | 73 --- src/GEOMClient/{Makefile.in => Makefile.am} | 48 +- src/GEOMFiltersSelection/Makefile.am | 75 +++ src/GEOMFiltersSelection/Makefile.in | 70 --- src/GEOMGUI/Makefile.am | 104 ++++ src/GEOMGUI/Makefile.in | 80 --- src/GEOMImpl/Makefile.am | 133 +++++ src/GEOMImpl/Makefile.in | 127 ----- src/GEOMToolsGUI/Makefile.am | 79 +++ src/GEOMToolsGUI/Makefile.in | 65 --- src/GEOM_I/{Makefile.in => Makefile.am} | 95 ++-- .../{Makefile.in => Makefile.am} | 58 +- src/GEOM_SWIG/Makefile.am | 164 ++++++ src/GEOM_SWIG/Makefile.in | 91 ---- src/GenerationGUI/Makefile.am | 83 +++ src/GenerationGUI/Makefile.in | 66 --- src/GroupGUI/{Makefile.in => Makefile.am} | 57 +- .../Makefile.in => IGESExport/Makefile.am} | 30 +- .../Makefile.in => IGESImport/Makefile.am} | 28 +- src/{Makefile.in => Makefile.am} | 13 +- src/MeasureGUI/Makefile.am | 107 ++++ src/MeasureGUI/Makefile.in | 92 ---- src/NMTAlgo/{Makefile.in => Makefile.am} | 53 +- src/NMTDS/{Makefile.in => Makefile.am} | 95 ++-- src/NMTTools/{Makefile.in => Makefile.am} | 117 ++-- src/NMTTools/NMTDS_Iterator.hxx | 138 ----- src/OBJECT/Makefile.am | 75 +++ src/OBJECT/Makefile.in | 69 --- src/OperationGUI/Makefile.am | 85 +++ src/OperationGUI/Makefile.in | 70 --- src/PrimitiveGUI/Makefile.am | 83 +++ src/PrimitiveGUI/Makefile.in | 68 --- src/RepairGUI/Makefile.am | 94 ++++ src/RepairGUI/Makefile.in | 80 --- src/SKETCHER/{Makefile.in => Makefile.am} | 33 +- src/STEPExport/Makefile.am | 46 ++ src/STEPExport/Makefile.in | 45 -- src/STEPImport/Makefile.am | 46 ++ src/STEPImport/Makefile.in | 45 -- src/ShHealOper/{Makefile.in => Makefile.am} | 62 +-- src/TransformationGUI/Makefile.am | 90 ++++ src/TransformationGUI/Makefile.in | 74 --- 84 files changed, 3505 insertions(+), 3278 deletions(-) create mode 100644 AUTHORS create mode 100644 COPYING create mode 100644 ChangeLog rename doc/Makefile.in => Makefile.am (55%) 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_omniorb.in create mode 100644 bin/Makefile.am rename configure.in.base => configure.ac (69%) rename adm_local/Makefile.in => doc/Makefile.am (71%) create mode 100644 doc/salome/Makefile.am delete mode 100644 doc/salome/Makefile.in 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 rename Makefile.in => resources/Makefile.am (63%) rename src/ARCHIMEDE/{Makefile.in => Makefile.am} (67%) rename src/{IGESImport/Makefile.in => BREPExport/Makefile.am} (71%) rename src/BREPImport/{Makefile.in => Makefile.am} (71%) create mode 100644 src/BasicGUI/Makefile.am delete mode 100644 src/BasicGUI/Makefile.in rename src/BlocksGUI/{Makefile.in => Makefile.am} (50%) rename src/BooleanGUI/{Makefile.in => Makefile.am} (53%) create mode 100644 src/BuildGUI/Makefile.am delete mode 100644 src/BuildGUI/Makefile.in rename src/DisplayGUI/{Makefile.in => Makefile.am} (54%) create mode 100644 src/DlgRef/Makefile.am delete mode 100644 src/DlgRef/Makefile.in create mode 100644 src/EntityGUI/Makefile.am delete mode 100644 src/EntityGUI/Makefile.in create mode 100644 src/GEOM/Makefile.am delete mode 100644 src/GEOM/Makefile.in rename src/GEOMAlgo/{Makefile.in => Makefile.am} (93%) create mode 100644 src/GEOMBase/Makefile.am delete mode 100644 src/GEOMBase/Makefile.in rename src/GEOMClient/{Makefile.in => Makefile.am} (67%) create mode 100644 src/GEOMFiltersSelection/Makefile.am delete mode 100644 src/GEOMFiltersSelection/Makefile.in create mode 100644 src/GEOMGUI/Makefile.am delete mode 100644 src/GEOMGUI/Makefile.in create mode 100644 src/GEOMImpl/Makefile.am delete mode 100644 src/GEOMImpl/Makefile.in create mode 100644 src/GEOMToolsGUI/Makefile.am delete mode 100644 src/GEOMToolsGUI/Makefile.in rename src/GEOM_I/{Makefile.in => Makefile.am} (51%) rename src/GEOM_I_Superv/{Makefile.in => Makefile.am} (51%) create mode 100644 src/GEOM_SWIG/Makefile.am delete mode 100644 src/GEOM_SWIG/Makefile.in create mode 100644 src/GenerationGUI/Makefile.am delete mode 100644 src/GenerationGUI/Makefile.in rename src/GroupGUI/{Makefile.in => Makefile.am} (51%) rename src/{BREPExport/Makefile.in => IGESExport/Makefile.am} (72%) rename src/{IGESExport/Makefile.in => IGESImport/Makefile.am} (72%) rename src/{Makefile.in => Makefile.am} (92%) create mode 100644 src/MeasureGUI/Makefile.am delete mode 100644 src/MeasureGUI/Makefile.in rename src/NMTAlgo/{Makefile.in => Makefile.am} (73%) rename src/NMTDS/{Makefile.in => Makefile.am} (91%) rename src/NMTTools/{Makefile.in => Makefile.am} (90%) delete mode 100644 src/NMTTools/NMTDS_Iterator.hxx create mode 100644 src/OBJECT/Makefile.am delete mode 100644 src/OBJECT/Makefile.in create mode 100644 src/OperationGUI/Makefile.am delete mode 100644 src/OperationGUI/Makefile.in create mode 100644 src/PrimitiveGUI/Makefile.am delete mode 100644 src/PrimitiveGUI/Makefile.in create mode 100644 src/RepairGUI/Makefile.am delete mode 100644 src/RepairGUI/Makefile.in rename src/SKETCHER/{Makefile.in => Makefile.am} (71%) create mode 100644 src/STEPExport/Makefile.am delete mode 100644 src/STEPExport/Makefile.in create mode 100644 src/STEPImport/Makefile.am delete mode 100644 src/STEPImport/Makefile.in rename src/ShHealOper/{Makefile.in => Makefile.am} (77%) create mode 100644 src/TransformationGUI/Makefile.am delete mode 100644 src/TransformationGUI/Makefile.in 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/ChangeLog b/ChangeLog new file mode 100644 index 000000000..e69de29bb diff --git a/doc/Makefile.in b/Makefile.am similarity index 55% rename from doc/Makefile.in rename to Makefile.am index af9e2aae5..d36ae99ef 100644 --- a/doc/Makefile.in +++ b/Makefile.am @@ -17,54 +17,35 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - # -* Makefile *- # # Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# $Header$ +# Date : 28/06/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage # -# 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/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..5dd0b63ae --- /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_GEOM.m4\ +README diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in deleted file mode 100644 index 8a907ac9e..000000000 --- a/adm_local/unix/make_commence.in +++ /dev/null @@ -1,276 +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@ -LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker -# add libstdc++ to link c++ library with libtool ! -LDFLAGS+= -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@ - -CAS_KERNEL=@CAS_KERNEL@ -CAS_MATH=@CAS_MATH@ -CAS_OCAF=@CAS_OCAF@ -CAS_OCAFVIS=@CAS_OCAFVIS@ -CAS_TKTopAlgo=@CAS_TKTopAlgo@ -CAS_VIEWER=@CAS_VIEWER@ -CAS_MODELER=@CAS_MODELER@ -CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ -CAS_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$(KERNEL_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$(KERNEL_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@ - -## 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 -incmakedir=${prefix}/salome_adm/unix - -docdir=${prefix}/doc/salome - -# -# begin of package rules -# - -.PHONY: all lib bin inc resources data 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_omniorb - -KERNEL_MAKE = make_module make_conclude 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 libtool.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_swig.m4 - -ACLOCAL_GUI = \ -check_vtk.m4 check_opengl.m4 check_qt.m4 \ -check_GUI.m4 check_corba_in_GUI.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/%) - 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 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_omniorb.in b/adm_local/unix/make_omniorb.in deleted file mode 100644 index aace887c0..000000000 --- a/adm_local/unix/make_omniorb.in +++ /dev/null @@ -1,56 +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): ${GUI_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..e7f7da1ce --- /dev/null +++ b/bin/Makefile.am @@ -0,0 +1,35 @@ +# 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 : GEOM +# + +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 7e516789c..e28a352ef 100755 --- a/build_configure +++ b/build_configure @@ -6,8 +6,11 @@ # # Author : Marc Tajchman - CEA # Date : 10/10/2002 +# Modified by : Alexander BORODIN (OCN) - autotools usage # $Header$ # +# 13/03/2007: Alexander BORODIN - OCN +# Reorganization for usage of autotools ORIG_DIR=`pwd` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` @@ -32,192 +35,63 @@ if test ! -d "${GUI_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 " ./salome_adm/unix/make_conclude \\" >> 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 -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 + +# ____________________________________________________________________ +# 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.in.base b/configure.ac similarity index 69% rename from configure.in.base rename to configure.ac index d1270c293..c5b8a5b74 100644 --- a/configure.in.base +++ b/configure.ac @@ -1,24 +1,19 @@ # -# PLEASE DO NOT MODIFY configure.in FILE -# -# ALL CHANGES WILL BE DISCARDED BY THE NEXT -# build_configure COMMAND -# -# CHANGES MUST BE MADE IN configure.in.base FILE -# -# # 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(src) -AC_CONFIG_AUX_DIR(${KERNEL_ROOT_DIR}/salome_adm/unix/config_files) +AC_INIT([Salome2 Project GEOM 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) @@ -32,6 +27,12 @@ AC_SUBST(XVERSION) MODULE_NAME=geom AC_SUBST(MODULE_NAME) +echo +echo --------------------------------------------- +echo Initialize source and build root directories +echo --------------------------------------------- +echo + dnl dnl Initialize source and build root directories dnl @@ -68,9 +69,14 @@ echo AC_PROG_MAKE_SET AC_PROG_INSTALL -dnl +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 @@ -89,7 +95,7 @@ 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='\${KERNEL_ROOT_DIR}'/salome_adm/unix/config_files/install-sh + INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh ;; esac @@ -103,6 +109,8 @@ 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 @@ -113,7 +121,7 @@ AC_CHECK_LIB(dl,dlopen) dnl add library libm : AC_CHECK_LIB(m,ceil) -dnl +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 @@ -161,6 +169,7 @@ echo testing swig echo --------------------------------------------- echo +AM_PATH_PYTHON(2.3) CHECK_SWIG echo @@ -171,6 +180,7 @@ echo ENABLE_PTHREADS +if test "x${GUI_DISABLE_CORBA}" != "xyes" ; then echo echo --------------------------------------------- echo testing omniORB @@ -194,12 +204,20 @@ 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 @@ -218,7 +236,7 @@ CHECK_QT echo echo --------------------------------------------- -echo testing MSG2QM +echo testing msg2qm echo --------------------------------------------- echo @@ -311,15 +329,6 @@ echo echo "Default ORB : $DEFAULT_ORB" echo -dnl generals files which could be included in every makefile - -AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence -AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude -AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module - -dnl les dependences -AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend - 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 @@ -328,67 +337,10 @@ else AC_SUBST(SETX) SETX="set -x" fi -# make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl -do -# if test ! -d $rep ; then -# eval mkdir $rep -# fi - $INSTALL -d $rep -done - -echo -echo --------------------------------------------- -echo copying resource files, shell scripts, and -echo xml files -echo --------------------------------------------- -echo - - -dnl copy resources directories - -#for i in `find $ROOT_SRCDIR -name 'resources' -print` -#do -# local_res=`echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -# local_res_dir=`echo $local_res | sed -e "s,[[^/]]*$,,;s,/$,,;s,^$,.,"` -# mkdir -p $local_res_dir -# cd $local_res_dir -# ln -fs $i -# echo $local_res -# cd $ROOT_BUILDDIR -#done - dnl copy shells and utilities contained in the bin directory -dnl excluding .in files (treated in AC-OUTPUT below) and CVS +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) ;; - *) /usr/bin/install $i .; echo $local_bin ;; - esac -done -cd $ROOT_BUILDDIR - -AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript - -dnl copy xml files to the build tree (lib directory) -dnl pourquoi ???? - -#cd lib -#for i in `find $ROOT_SRCDIR -name "*.xml" -print` -#do -# ln -fs $i -# echo `echo $i | sed -e "s,$ROOT_SRCDIR,.,"` -#done -#cd $ROOT_BUILDDIR - echo echo --------------------------------------------- @@ -397,7 +349,69 @@ echo --------------------------------------------- echo AC_OUTPUT_COMMANDS([ \ - chmod +x ./bin/* \ + chmod +x ./bin/*; \ + chmod +x ./bin/salome/*; \ ]) -## do not delete this line +# 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 \ + ./GEOM_version.h \ + ./doc/Makefile \ + ./doc/salome/Makefile \ + ./doc/salome/gui/Makefile \ + ./doc/salome/tui/Makefile \ + ./doc/salome/tui/GEOM/doxyfile \ + ./doc/salome/tui/GEOM/sources/static/tree.js \ + ./src/Makefile \ + ./src/ARCHIMEDE/Makefile \ + ./src/BREPExport/Makefile \ + ./src/BREPImport/Makefile \ + ./src/BasicGUI/Makefile \ + ./src/BlocksGUI/Makefile \ + ./src/BooleanGUI/Makefile \ + ./src/BuildGUI/Makefile \ + ./src/DisplayGUI/Makefile \ + ./src/DlgRef/Makefile \ + ./src/EntityGUI/Makefile \ + ./src/GEOM/Makefile \ + ./src/GEOMAlgo/Makefile \ + ./src/GEOMBase/Makefile \ + ./src/GEOMClient/Makefile \ + ./src/GEOMFiltersSelection/Makefile \ + ./src/GEOMGUI/Makefile \ + ./src/GEOMImpl/Makefile \ + ./src/GEOMToolsGUI/Makefile \ + ./src/GEOM_I/Makefile \ + ./src/GEOM_I_Superv/Makefile \ + ./src/GEOM_SWIG/Makefile \ + ./src/GenerationGUI/Makefile \ + ./src/GroupGUI/Makefile \ + ./src/IGESExport/Makefile \ + ./src/IGESImport/Makefile \ + ./src/MeasureGUI/Makefile \ + ./src/NMTAlgo/Makefile \ + ./src/NMTDS/Makefile \ + ./src/NMTTools/Makefile \ + ./src/OBJECT/Makefile \ + ./src/OperationGUI/Makefile \ + ./src/PrimitiveGUI/Makefile \ + ./src/RepairGUI/Makefile \ + ./src/SKETCHER/Makefile \ + ./src/STEPExport/Makefile \ + ./src/STEPImport/Makefile \ + ./src/ShHealOper/Makefile \ + ./src/TransformationGUI/Makefile \ + ./resources/Makefile \ + ./resources/GEOMCatalog.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.am b/doc/salome/Makefile.am new file mode 100644 index 000000000..43c97dd62 --- /dev/null +++ b/doc/salome/Makefile.am @@ -0,0 +1,42 @@ +# 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 +# + +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 30/11/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header: +# + +SUBDIRS= tui gui +SUBDIRSTUI= tui +SUBDIRSGUI= gui + +usr_docs: + @@SETX@; for d in $(SUBDIRSGUI); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done; + +docs: usr_docs + +dev_docs: + @@SETX@; for d in $(SUBDIRSTUI); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done; diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in deleted file mode 100644 index d65e5cd8f..000000000 --- a/doc/salome/Makefile.in +++ /dev/null @@ -1,74 +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 - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -SUBDIRS= tui gui -SUBDIRSGUI= gui -SUBDIRSTUI= tui - -@COMMENCE@ - -usr_docs: - @@SETX@; for d in $(SUBDIRSGUI); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - 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/GEOM; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/GEOM; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -install: - $(MAKE) docs - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/GEOM; then \ - (cd $$d && $(MAKE) $@); \ - fi; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/GEOM; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - 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 78cad82e0..404cc5805 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,14 +18,12 @@ # # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : doc -top_srcdir=@top_srcdir@ -top_builddir=../../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +EXTRA_DIST+=GEOM usr_docs: cp -fr $(srcdir)/GEOM ./ @@ -34,16 +31,14 @@ usr_docs: docs: usr_docs -clean: +clean-local: rm -fr `ls | grep -v "Makefile"` - -distclean: clean rm -fr GEOM -install: +install-data-local: usr_docs mkdir -p $(docdir)/gui cp -rf GEOM $(docdir)/gui -find $(PWD) -name CVS -prune -exec rm -rf {} \; -uninstall: +uninstall-local: rm -rf $(docdir)/gui/GEOM diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am new file mode 100644 index 000000000..b5b8b7721 --- /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+=GEOM + +dev_docs: + cp -fr $(srcdir)/GEOM ./INPUT; \ + cp -f ./GEOM/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)/GEOM/sources/ GEOM ; \ + rm -fr INPUT + +doctuidir=$(docdir)/tui/GEOM + +nodist_doctui_DATA= GEOM/doxyfile +EXTRA_DIST+= GEOM/doxyfile.in diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in deleted file mode 100644 index ee5277502..000000000 --- a/doc/salome/tui/Makefile.in +++ /dev/null @@ -1,95 +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 - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -root_srcdir=@ROOT_SRCDIR@ -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -PYTHON_SCRIPTS = \ - geompy.py \ - GEOM_TestMeasures.py - -#PYTHON_SCRIPTS_PY2 = py2/geompy.py py2/GEOM_TestMeasures.py - -dev_docs: - cp -fr $(srcdir)/GEOM ./INPUT; \ - cp -fr ./GEOM/doxyfile ./GEOM/doxyfile_py ./INPUT; \ - cp -fr ./GEOM/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)/share/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)/GEOM/sources/static/*.* ./GEOM/ - cp -fr $(srcdir)/GEOM/sources/ GEOM/ - cp -fr $(srcdir)/GEOM/HTML/ GEOM/ - rm -fr INPUT - -clean: - rm -fr GEOM - -distclean: clean - rm -fr INPUT - -install: - $(INSTALL) -d $(docdir); \ - mkdir -p $(docdir)/tui - cp -fr GEOM $(docdir)/tui - -uninstall: - rm -fr $(docdir)/tui/GEOM diff --git a/idl/Makefile.am b/idl/Makefile.am new file mode 100644 index 000000000..93172d6bf --- /dev/null +++ b/idl/Makefile.am @@ -0,0 +1,103 @@ +# 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= GEOM_Gen.idl GEOM_Superv.idl + +EXTRA_DIST+= $(BASEIDL_FILES) + +# This variable defines the files to be installed +salomeidl_DATA = $(BASEIDL_FILES) + +# GUI idl common library +lib_LTLIBRARIES = libSalomeIDLGEOM.la + +# Sources built from idl files +nodist_libSalomeIDLGEOM_la_SOURCES= GEOM_GenSK.cc GEOM_SupervSK.cc + +# header files must be exported: other modules have to use this library +nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh) + +libSalomeIDLGEOM_la_CPPFLAGS =\ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ + @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ +libSalomeIDLGEOM_la_LDFLAGS = -no-undefined -version-info=0:0:0 +libSalomeIDLGEOM_la_LIBADD = \ + $(STDLIB) \ + @CORBA_LIBS@ \ + $(KERNEL_LDFLAGS) -lSalomeIDLKernel + +# 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 +IDLCXXFLAGS = \ + -bcxx \ + @IDLCXXFLAGS@ \ + -I$(top_builddir)/idl/salome \ + -I$(KERNEL_ROOT_DIR)/idl/salome \ + -I$(top_builddir)/salome_adm/unix +IDLPYFLAGS = \ + @IDLPYFLAGS@ \ + -I$(KERNEL_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 $$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 8d13e3185..000000000 --- a/idl/Makefile.in +++ /dev/null @@ -1,90 +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 - -@COMMENCE@ - -IDL_FILES = \ - GEOM_Gen.idl \ - GEOM_Superv.idl - -PY_CLIENT_IDL = $(IDL_FILES) - -LIB_LOCATION_SUFFIX=@LIB_LOCATION_SUFFIX@ - -# 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/Makefile.in b/resources/Makefile.am similarity index 63% rename from Makefile.in rename to resources/Makefile.am index 03e147ef6..0c78e8a53 100644 --- a/Makefile.in +++ b/resources/Makefile.am @@ -21,25 +21,16 @@ # # Author : Patrick GOLDBRONN (CEA) # Date : 28/06/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage # $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 +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ - -SUBDIRS = idl src doc adm_local - -RESOURCES_FILES = \ +dist_salomeres_DATA = \ GEOM_en.xml \ GEOM_fr.xml \ GEOM.config \ -GEOMCatalog.xml \ SalomeApp.xml \ GEOMDS_Resources \ ImportExport \ @@ -199,90 +190,4 @@ propagate.png \ redo.png \ undo.png - -BIN_SCRIPT= \ -VERSION - -# copy header files in common directory - -include_list = include/salome/SALOMEconfig.h \ - include/salome/GEOM_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/GEOM_version.h: GEOM_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 - +nodist_salomeres_DATA = GEOMCatalog.xml diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.am similarity index 67% rename from src/ARCHIMEDE/Makefile.in rename to src/ARCHIMEDE/Makefile.am index 10b2247cc..63d6d9d08 100644 --- a/src/ARCHIMEDE/Makefile.in +++ b/src/ARCHIMEDE/Makefile.am @@ -21,37 +21,33 @@ # # # -# File : Makefile.in +# File : Makefile.am # Author : Nicolas REJNERI +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ +salomeinclude_HEADERS = \ + Archimede_VolumeSection.hxx # Libraries targets -LIB = libGEOMArchimede.la -LIB_SRC = Archimede_VolumeSection.cxx -LIB_CLIENT_IDL = - -# header files -EXPORT_HEADERS = Archimede_VolumeSection.hxx +lib_LTLIBRARIES = libGEOMArchimede.la -# additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS) +# sources files +dist_libGEOMArchimede_la_SOURCES = \ + Archimede_VolumeSection.cxx -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = - -@CONCLUDE@ +# additionnal information to compil and link file +libGEOMArchimede_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) + +libGEOMArchimede_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(CAS_KERNEL) \ + $(CAS_MODELER) -lTKMesh \ + $(STDLIB) diff --git a/src/IGESImport/Makefile.in b/src/BREPExport/Makefile.am similarity index 71% rename from src/IGESImport/Makefile.in rename to src/BREPExport/Makefile.am index 482fd2490..fa1ce21e3 100644 --- a/src/IGESImport/Makefile.in +++ b/src/BREPExport/Makefile.am @@ -20,26 +20,25 @@ # # File : Makefile.in # Author : Pavel TELKOV +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets +lib_LTLIBRARIES = libBREPExport.la -LIB= libIGESImport.la - -LIB_SRC = IGESImport.cxx +# Sources files +dist_libBREPExport_la_SOURCES = \ + BREPExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS) - -@CONCLUDE@ +libBREPExport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) + +libBREPExport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKBRep diff --git a/src/BREPImport/Makefile.in b/src/BREPImport/Makefile.am similarity index 71% rename from src/BREPImport/Makefile.in rename to src/BREPImport/Makefile.am index 4656368c2..610cddfb4 100644 --- a/src/BREPImport/Makefile.in +++ b/src/BREPImport/Makefile.am @@ -20,26 +20,25 @@ # # File : Makefile.in # Author : Pavel TELKOV +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets +lib_LTLIBRARIES = libBREPImport.la -LIB= libBREPImport.la - -LIB_SRC = BREPImport.cxx +# Sources files +dist_libBREPImport_la_SOURCES = \ + BREPImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS) - -@CONCLUDE@ +libBREPImport_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ + $(CAS_CPPFLAGS) + +libBREPImport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(CAS_LDPATH) -lTKBRep \ + $(STDLIB) diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am new file mode 100644 index 000000000..ab4659b13 --- /dev/null +++ b/src/BasicGUI/Makefile.am @@ -0,0 +1,100 @@ +# GEOM BASICGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = BasicGUI_PointDlg.h \ + GEOM_BasicGUI.hxx + +# Libraries targets +lib_LTLIBRARIES = libBasicGUI.la + +# Sources files +dist_libBasicGUI_la_SOURCES = \ + BasicGUI.cxx \ + BasicGUI_PointDlg.cxx \ + BasicGUI_LineDlg.cxx \ + BasicGUI_CircleDlg.cxx \ + BasicGUI_EllipseDlg.cxx \ + BasicGUI_ArcDlg.cxx \ + BasicGUI_VectorDlg.cxx \ + BasicGUI_PlaneDlg.cxx \ + BasicGUI_WorkingPlaneDlg.cxx \ + BasicGUI_CurveDlg.cxx \ + BasicGUI_MarkerDlg.cxx + +MOC_FILES = \ + BasicGUI_PointDlg_moc.cxx \ + BasicGUI_LineDlg_moc.cxx \ + BasicGUI_CircleDlg_moc.cxx \ + BasicGUI_EllipseDlg_moc.cxx \ + BasicGUI_ArcDlg_moc.cxx \ + BasicGUI_VectorDlg_moc.cxx \ + BasicGUI_PlaneDlg_moc.cxx \ + BasicGUI_WorkingPlaneDlg_moc.cxx \ + BasicGUI_CurveDlg_moc.cxx \ + BasicGUI_MarkerDlg_moc.cxx + +nodist_libBasicGUI_la_SOURCES= \ + $(MOC_FILES) + + +# LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl + +# LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libBasicGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMClient \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + + +libBasicGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la \ + ../GEOMGUI/libGEOM.la \ + $(GUI_LDFLAGS) -lsuit diff --git a/src/BasicGUI/Makefile.in b/src/BasicGUI/Makefile.in deleted file mode 100644 index e5fb2cec1..000000000 --- a/src/BasicGUI/Makefile.in +++ /dev/null @@ -1,80 +0,0 @@ -# GEOM BASICGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= BasicGUI_PointDlg.h \ - GEOM_BasicGUI.hxx - -# Libraries targets -LIB = libBasicGUI.la - -LIB_SRC = BasicGUI.cxx \ - BasicGUI_PointDlg.cxx \ - BasicGUI_LineDlg.cxx \ - BasicGUI_CircleDlg.cxx \ - BasicGUI_EllipseDlg.cxx \ - BasicGUI_ArcDlg.cxx \ - BasicGUI_VectorDlg.cxx \ - BasicGUI_PlaneDlg.cxx \ - BasicGUI_WorkingPlaneDlg.cxx \ - BasicGUI_CurveDlg.cxx \ - BasicGUI_MarkerDlg.cxx - -LIB_MOC = \ - BasicGUI_PointDlg.h \ - BasicGUI_LineDlg.h \ - BasicGUI_CircleDlg.h \ - BasicGUI_EllipseDlg.h \ - BasicGUI_ArcDlg.h \ - BasicGUI_VectorDlg.h \ - BasicGUI_PlaneDlg.h \ - BasicGUI_WorkingPlaneDlg.h \ - BasicGUI_CurveDlg.h \ - BasicGUI_MarkerDlg.h \ - GEOM_BasicGUI.hxx - -LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOM - -@CONCLUDE@ diff --git a/src/BlocksGUI/Makefile.in b/src/BlocksGUI/Makefile.am similarity index 50% rename from src/BlocksGUI/Makefile.in rename to src/BlocksGUI/Makefile.am index 26c445679..0c1f70470 100644 --- a/src/BlocksGUI/Makefile.in +++ b/src/BlocksGUI/Makefile.am @@ -22,24 +22,19 @@ # # File : Makefile.in # Author : Julia DOROVSKIKH (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= # Libraries targets -LIB = libBlocksGUI.la +lib_LTLIBRARIES = libBlocksGUI.la -LIB_SRC = \ +# Sources files +dist_libBlocksGUI_la_SOURCES = \ BlocksGUI.cxx \ BlocksGUI_QuadFaceDlg.cxx \ BlocksGUI_BlockDlg.cxx \ @@ -47,23 +42,45 @@ LIB_SRC = \ BlocksGUI_PropagateDlg.cxx \ BlocksGUI_TrsfDlg.cxx -LIB_MOC = \ - BlocksGUI_QuadFaceDlg.h \ - BlocksGUI_BlockDlg.h \ - BlocksGUI_ExplodeDlg.h \ - BlocksGUI_PropagateDlg.h \ - BlocksGUI_TrsfDlg.h \ - GEOM_BlocksGUI.hxx +MOC_FILES = \ + BlocksGUI_QuadFaceDlg_moc.cxx \ + BlocksGUI_BlockDlg_moc.cxx \ + BlocksGUI_ExplodeDlg_moc.cxx \ + BlocksGUI_PropagateDlg_moc.cxx \ + BlocksGUI_TrsfDlg_moc.cxx -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl +nodist_libBlocksGUI_la_SOURCES= \ + $(MOC_FILES) -LIB_SERVER_IDL = +#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl -# additionnal information to compil and link file +#LIB_SERVER_IDL = -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +# additionnal information to compil and link file -LDFLAGS += -lGEOMFiltersSelection -lGEOMBase +libBlocksGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -@CONCLUDE@ +libBlocksGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../DlgRef/libDlgRef.la \ + ../GEOMBase/libGEOMBase.la \ + ../GEOMGUI/libGEOM.la \ + $(QT_MT_LIBS) diff --git a/src/BooleanGUI/Makefile.in b/src/BooleanGUI/Makefile.am similarity index 53% rename from src/BooleanGUI/Makefile.in rename to src/BooleanGUI/Makefile.am index 45846c838..fd149c69c 100644 --- a/src/BooleanGUI/Makefile.in +++ b/src/BooleanGUI/Makefile.am @@ -23,38 +23,53 @@ # # File : Makefile.in # Author : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= # Libraries targets -LIB = libBooleanGUI.la +lib_LTLIBRARIES = libBooleanGUI.la -LIB_SRC = BooleanGUI.cxx \ - BooleanGUI_Dialog.cxx +# Sources files +dist_libBooleanGUI_la_SOURCES = \ + BooleanGUI.cxx \ + BooleanGUI_Dialog.cxx -LIB_MOC = \ - BooleanGUI_Dialog.h +MOC_FILES = \ + BooleanGUI_Dialog_moc.cxx -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl +nodist_libBooleanGUI_la_SOURCES= \ + $(MOC_FILES) -LIB_SERVER_IDL = +#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl -# additionnal information to compil and link file +#LIB_SERVER_IDL = -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +# additionnal information to compil and link file -LDFLAGS += -lGEOMBase +libBooleanGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -@CONCLUDE@ +libBooleanGUI_la_LDFLAGS = \ + ../GEOMBase/libGEOMBase.la diff --git a/src/BuildGUI/Makefile.am b/src/BuildGUI/Makefile.am new file mode 100644 index 000000000..59820f17b --- /dev/null +++ b/src/BuildGUI/Makefile.am @@ -0,0 +1,87 @@ +# GEOM BUILDGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libBuildGUI.la + +# Sources files +dist_libBuildGUI_la_SOURCES = \ + BuildGUI.cxx \ + BuildGUI_EdgeDlg.cxx \ + BuildGUI_WireDlg.cxx \ + BuildGUI_FaceDlg.cxx \ + BuildGUI_ShellDlg.cxx \ + BuildGUI_SolidDlg.cxx \ + BuildGUI_CompoundDlg.cxx + +MOC_FILES = \ + BuildGUI_EdgeDlg_moc.cxx \ + BuildGUI_WireDlg_moc.cxx \ + BuildGUI_FaceDlg_moc.cxx \ + BuildGUI_ShellDlg_moc.cxx \ + BuildGUI_SolidDlg_moc.cxx \ + BuildGUI_CompoundDlg_moc.cxx + +nodist_libBuildGUI_la_SOURCES= \ + $(MOC_FILES) + +# LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl + +# LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libBuildGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libBuildGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la diff --git a/src/BuildGUI/Makefile.in b/src/BuildGUI/Makefile.in deleted file mode 100644 index 9ba43d0ec..000000000 --- a/src/BuildGUI/Makefile.in +++ /dev/null @@ -1,71 +0,0 @@ -# GEOM BUILDGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# Libraries targets -LIB = libBuildGUI.la - -LIB_SRC = BuildGUI.cxx \ - BuildGUI_EdgeDlg.cxx \ - BuildGUI_WireDlg.cxx \ - BuildGUI_FaceDlg.cxx \ - BuildGUI_ShellDlg.cxx \ - BuildGUI_SolidDlg.cxx \ - BuildGUI_CompoundDlg.cxx - -LIB_MOC = \ - BuildGUI_EdgeDlg.h \ - BuildGUI_WireDlg.h \ - BuildGUI_FaceDlg.h \ - BuildGUI_ShellDlg.h \ - BuildGUI_SolidDlg.h \ - BuildGUI_CompoundDlg.h \ - GEOM_BuildGUI.hxx - -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection -lGEOMBase - -@CONCLUDE@ diff --git a/src/DisplayGUI/Makefile.in b/src/DisplayGUI/Makefile.am similarity index 54% rename from src/DisplayGUI/Makefile.in rename to src/DisplayGUI/Makefile.am index 8df00b985..9f4f6a3bc 100644 --- a/src/DisplayGUI/Makefile.in +++ b/src/DisplayGUI/Makefile.am @@ -23,36 +23,48 @@ # # File : Makefile.in # Author : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets -LIB = libDisplayGUI.la +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS= DisplayGUI.h +salomeinclude_HEADERS = \ + DisplayGUI.h -LIB_SRC = DisplayGUI.cxx +# Libraries targets +lib_LTLIBRARIES = libDisplayGUI.la -LIB_MOC = +dist_libDisplayGUI_la_SOURCES = DisplayGUI.cxx -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl +#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl -LIB_SERVER_IDL = +#LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOM +libDisplayGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMClient \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -@CONCLUDE@ +libDisplayGUI_la_LDFLAGS = \ + ../GEOMGUI/libGEOM.la \ + ../GEOMToolsGUI/libGEOMToolsGUI.la \ + $(GUI_LDFLAGS) -lsuit -lSVTK -lSOCC -lSalomePrs -lSalomeApp \ + $(VTK_LIBS) \ + $(QT_MT_LIBS) diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am new file mode 100644 index 000000000..2d893f870 --- /dev/null +++ b/src/DlgRef/Makefile.am @@ -0,0 +1,217 @@ +# GEOM DLGREF : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets +lib_LTLIBRARIES = libDlgRef.la + +# Sources files +dist_libDlgRef_la_SOURCES = \ + DlgRef_Skeleton_QTD.cxx \ + DlgRef_1Sel_QTD.cxx \ + DlgRef_2Sel_QTD.cxx \ + DlgRef_3Sel_QTD.cxx \ + DlgRef_1Sel1Check_QTD.cxx \ + DlgRef_1Sel3Check_QTD.cxx \ + DlgRef_1Sel1Check1List_QTD.cxx \ + DlgRef_1Sel1Spin_QTD.cxx \ + DlgRef_1Sel2Spin_QTD.cxx \ + DlgRef_1Sel3Spin_QTD.cxx \ + DlgRef_1Sel4Spin_QTD.cxx \ + DlgRef_1Sel5Spin_QTD.cxx \ + DlgRef_2Sel1Spin_QTD.cxx \ + DlgRef_2Sel2Spin_QTD.cxx \ + DlgRef_2Sel3Spin_QTD.cxx \ + DlgRef_1Sel1Spin1Check_QTD.cxx \ + DlgRef_2Sel1Spin2Check_QTD.cxx \ + DlgRef_2Sel2Spin1Check_QTD.cxx \ + DlgRef_2Sel4Spin1Check_QTD.cxx \ + DlgRef_3Sel4Spin2Check_QTD.cxx \ + DlgRef_4Sel1List_QTD.cxx \ + DlgRef_2Sel1List_QTD.cxx \ + DlgRef_1List1Spin1Btn_QTD.cxx \ + DlgRef_4Sel1List1Check_QTD.cxx \ + DlgRef_1Spin_QTD.cxx \ + DlgRef_2Spin_QTD.cxx \ + DlgRef_3Spin_QTD.cxx \ + DlgRef_3Spin1Check_QTD.cxx \ + DlgRef_3Sel3Spin1Check_QTD.cxx \ + DlgRef_4Sel1Spin2Check_QTD.cxx \ + DlgRef_SpinBox.cxx \ + DlgRef_1Sel1Spin.cxx \ + DlgRef_1Sel2Spin.cxx \ + DlgRef_1Sel3Spin.cxx \ + DlgRef_1Sel4Spin.cxx \ + DlgRef_1Sel5Spin.cxx \ + DlgRef_2Sel1Spin.cxx \ + DlgRef_2Sel2Spin.cxx \ + DlgRef_2Sel3Spin.cxx \ + DlgRef_1Sel1Spin1Check.cxx \ + DlgRef_2Sel1Spin2Check.cxx \ + DlgRef_2Sel2Spin1Check.cxx \ + DlgRef_2Sel4Spin1Check.cxx \ + DlgRef_3Sel4Spin2Check.cxx \ + DlgRef_3Sel3Spin1Check.cxx \ + DlgRef_1Spin.cxx \ + DlgRef_2Spin.cxx \ + DlgRef_3Spin.cxx \ + DlgRef_3Spin1Check.cxx \ + DlgRef_3Sel1Spin.cxx \ + DlgRef_3Check_QTD.cxx \ + DlgRef_6Sel_QTD.cxx \ + DlgRef_4Sel1Spin2Check.cxx + +MOC_FILES = \ + DlgRef_Skeleton_QTD_moc.cxx \ + DlgRef_1Sel_QTD_moc.cxx \ + DlgRef_2Sel_QTD_moc.cxx \ + DlgRef_3Sel_QTD_moc.cxx \ + DlgRef_1Sel1Check_QTD_moc.cxx \ + DlgRef_1Sel3Check_QTD_moc.cxx \ + DlgRef_1Sel1Check1List_QTD_moc.cxx \ + DlgRef_1Sel1Spin_QTD_moc.cxx \ + DlgRef_1Sel2Spin_QTD_moc.cxx \ + DlgRef_1Sel3Spin_QTD_moc.cxx \ + DlgRef_1Sel4Spin_QTD_moc.cxx \ + DlgRef_1Sel5Spin_QTD_moc.cxx \ + DlgRef_2Sel1Spin_QTD_moc.cxx \ + DlgRef_2Sel2Spin_QTD_moc.cxx \ + DlgRef_2Sel3Spin_QTD_moc.cxx \ + DlgRef_1Sel1Spin1Check_QTD_moc.cxx \ + DlgRef_2Sel1Spin2Check_QTD_moc.cxx \ + DlgRef_2Sel2Spin1Check_QTD_moc.cxx \ + DlgRef_2Sel4Spin1Check_QTD_moc.cxx \ + DlgRef_3Sel4Spin2Check_QTD_moc.cxx \ + DlgRef_4Sel1List_QTD_moc.cxx \ + DlgRef_2Sel1List_QTD_moc.cxx \ + DlgRef_1List1Spin1Btn_QTD_moc.cxx \ + DlgRef_4Sel1List1Check_QTD_moc.cxx \ + DlgRef_1Spin_QTD_moc.cxx \ + DlgRef_2Spin_QTD_moc.cxx \ + DlgRef_3Spin_QTD_moc.cxx \ + DlgRef_3Spin1Check_QTD_moc.cxx \ + DlgRef_3Sel3Spin1Check_QTD_moc.cxx \ + DlgRef_4Sel1Spin2Check_QTD_moc.cxx \ + DlgRef_SpinBox_moc.cxx \ + DlgRef_1Sel1Spin_moc.cxx \ + DlgRef_1Sel2Spin_moc.cxx \ + DlgRef_1Sel3Spin_moc.cxx \ + DlgRef_1Sel4Spin_moc.cxx \ + DlgRef_1Sel5Spin_moc.cxx \ + DlgRef_2Sel1Spin_moc.cxx \ + DlgRef_2Sel2Spin_moc.cxx \ + DlgRef_2Sel3Spin_moc.cxx \ + DlgRef_1Sel1Spin1Check_moc.cxx \ + DlgRef_2Sel1Spin2Check_moc.cxx \ + DlgRef_2Sel2Spin1Check_moc.cxx \ + DlgRef_2Sel4Spin1Check_moc.cxx \ + DlgRef_3Sel4Spin2Check_moc.cxx \ + DlgRef_3Sel3Spin1Check_moc.cxx \ + DlgRef_1Spin_moc.cxx \ + DlgRef_2Spin_moc.cxx \ + DlgRef_3Spin_moc.cxx \ + DlgRef_3Spin1Check_moc.cxx \ + DlgRef_3Sel1Spin_moc.cxx \ + DlgRef_1Sel_Ext_moc.cxx \ + DlgRef_3Check_QTD_moc.cxx \ + DlgRef_6Sel_QTD_moc.cxx \ + DlgRef_4Sel1Spin2Check_moc.cxx + +# header files +salomeinclude_HEADERS = \ + DlgRef_Skeleton_QTD.h \ + DlgRef_1Sel_QTD.h \ + DlgRef_2Sel_QTD.h \ + DlgRef_3Sel_QTD.h \ + DlgRef_1Sel1Check_QTD.h \ + DlgRef_1Sel3Check_QTD.h \ + DlgRef_1Sel1Check1List_QTD.h \ + DlgRef_1Sel1Spin_QTD.h \ + DlgRef_1Sel2Spin_QTD.h \ + DlgRef_1Sel3Spin_QTD.h \ + DlgRef_1Sel4Spin_QTD.h \ + DlgRef_1Sel5Spin_QTD.h \ + DlgRef_2Sel1Spin_QTD.h \ + DlgRef_2Sel2Spin_QTD.h \ + DlgRef_2Sel3Spin_QTD.h \ + DlgRef_1Sel1Spin1Check_QTD.h \ + DlgRef_2Sel1Spin2Check_QTD.h \ + DlgRef_2Sel2Spin1Check_QTD.h \ + DlgRef_2Sel4Spin1Check_QTD.h \ + DlgRef_3Sel4Spin2Check_QTD.h \ + DlgRef_4Sel1List_QTD.h \ + DlgRef_2Sel1List_QTD.h \ + DlgRef_1List1Spin1Btn_QTD.h \ + DlgRef_4Sel1List1Check_QTD.h \ + DlgRef_1Spin_QTD.h \ + DlgRef_2Spin_QTD.h \ + DlgRef_3Spin_QTD.h \ + DlgRef_3Spin1Check_QTD.h \ + DlgRef_3Sel3Spin1Check_QTD.h \ + DlgRef_4Sel1Spin2Check_QTD.h \ + DlgRef_SpinBox.h \ + DlgRef_1Sel1Spin.h \ + DlgRef_1Sel2Spin.h \ + DlgRef_1Sel3Spin.h \ + DlgRef_1Sel4Spin.h \ + DlgRef_1Sel5Spin.h \ + DlgRef_2Sel1Spin.h \ + DlgRef_2Sel2Spin.h \ + DlgRef_2Sel3Spin.h \ + DlgRef_1Sel1Spin1Check.h \ + DlgRef_2Sel1Spin2Check.h \ + DlgRef_2Sel2Spin1Check.h \ + DlgRef_2Sel4Spin1Check.h \ + DlgRef_3Sel4Spin2Check.h \ + DlgRef_3Sel3Spin1Check.h \ + DlgRef_1Spin.h \ + DlgRef_2Spin.h \ + DlgRef_3Spin.h \ + DlgRef_3Spin1Check.h \ + DlgRef_3Sel1Spin.h \ + DlgRef_1Sel_Ext.h \ + DlgRef_3Check_QTD.h \ + DlgRef_6Sel_QTD.h \ + DlgRef_4Sel1Spin2Check.h \ + GEOM_DlgRef.hxx + +nodist_libDlgRef_la_SOURCES= \ + $(MOC_FILES) + +# additionnal information to compil and link file +libDlgRef_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) + +libDlgRef_la_LDFLAGS = \ + $(GUI_LDFLAGS) -lqtx \ + $(STDLIB) \ + $(QT_MT_LIBS) diff --git a/src/DlgRef/Makefile.in b/src/DlgRef/Makefile.in deleted file mode 100644 index 1f5b195c5..000000000 --- a/src/DlgRef/Makefile.in +++ /dev/null @@ -1,164 +0,0 @@ -# GEOM DLGREF : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets -LIB = libDlgRef.la - -LIB_SRC = DlgRef_Skeleton_QTD.cxx \ - DlgRef_1Sel_QTD.cxx \ - DlgRef_2Sel_QTD.cxx \ - DlgRef_3Sel_QTD.cxx \ - DlgRef_1Sel1Check_QTD.cxx \ - DlgRef_1Sel3Check_QTD.cxx \ - DlgRef_1Sel1Check1List_QTD.cxx \ - DlgRef_1Sel1Spin_QTD.cxx \ - DlgRef_1Sel2Spin_QTD.cxx \ - DlgRef_1Sel3Spin_QTD.cxx \ - DlgRef_1Sel4Spin_QTD.cxx \ - DlgRef_1Sel5Spin_QTD.cxx \ - DlgRef_2Sel1Spin_QTD.cxx \ - DlgRef_2Sel2Spin_QTD.cxx \ - DlgRef_2Sel3Spin_QTD.cxx \ - DlgRef_1Sel1Spin1Check_QTD.cxx \ - DlgRef_2Sel1Spin2Check_QTD.cxx \ - DlgRef_2Sel2Spin1Check_QTD.cxx \ - DlgRef_2Sel4Spin1Check_QTD.cxx \ - DlgRef_3Sel4Spin2Check_QTD.cxx \ - DlgRef_4Sel1List_QTD.cxx \ - DlgRef_2Sel1List_QTD.cxx \ - DlgRef_1List1Spin1Btn_QTD.cxx \ - DlgRef_4Sel1List1Check_QTD.cxx \ - DlgRef_1Spin_QTD.cxx \ - DlgRef_2Spin_QTD.cxx \ - DlgRef_3Spin_QTD.cxx \ - DlgRef_3Spin1Check_QTD.cxx \ - DlgRef_3Sel3Spin1Check_QTD.cxx \ - DlgRef_4Sel1Spin2Check_QTD.cxx \ - DlgRef_SpinBox.cxx \ - DlgRef_1Sel1Spin.cxx \ - DlgRef_1Sel2Spin.cxx \ - DlgRef_1Sel3Spin.cxx \ - DlgRef_1Sel4Spin.cxx \ - DlgRef_1Sel5Spin.cxx \ - DlgRef_2Sel1Spin.cxx \ - DlgRef_2Sel2Spin.cxx \ - DlgRef_2Sel3Spin.cxx \ - DlgRef_1Sel1Spin1Check.cxx \ - DlgRef_2Sel1Spin2Check.cxx \ - DlgRef_2Sel2Spin1Check.cxx \ - DlgRef_2Sel4Spin1Check.cxx \ - DlgRef_3Sel4Spin2Check.cxx \ - DlgRef_3Sel3Spin1Check.cxx \ - DlgRef_1Spin.cxx \ - DlgRef_2Spin.cxx \ - DlgRef_3Spin.cxx \ - DlgRef_3Spin1Check.cxx \ - DlgRef_3Sel1Spin.cxx \ - DlgRef_3Check_QTD.cxx \ - DlgRef_6Sel_QTD.cxx \ - DlgRef_4Sel1Spin2Check.cxx - -LIB_MOC = \ - DlgRef_Skeleton_QTD.h \ - DlgRef_1Sel_QTD.h \ - DlgRef_2Sel_QTD.h \ - DlgRef_3Sel_QTD.h \ - DlgRef_1Sel1Check_QTD.h \ - DlgRef_1Sel3Check_QTD.h \ - DlgRef_1Sel1Check1List_QTD.h \ - DlgRef_1Sel1Spin_QTD.h \ - DlgRef_1Sel2Spin_QTD.h \ - DlgRef_1Sel3Spin_QTD.h \ - DlgRef_1Sel4Spin_QTD.h \ - DlgRef_1Sel5Spin_QTD.h \ - DlgRef_2Sel1Spin_QTD.h \ - DlgRef_2Sel2Spin_QTD.h \ - DlgRef_2Sel3Spin_QTD.h \ - DlgRef_1Sel1Spin1Check_QTD.h \ - DlgRef_2Sel1Spin2Check_QTD.h \ - DlgRef_2Sel2Spin1Check_QTD.h \ - DlgRef_2Sel4Spin1Check_QTD.h \ - DlgRef_3Sel4Spin2Check_QTD.h \ - DlgRef_4Sel1List_QTD.h \ - DlgRef_2Sel1List_QTD.h \ - DlgRef_1List1Spin1Btn_QTD.h \ - DlgRef_4Sel1List1Check_QTD.h \ - DlgRef_1Spin_QTD.h \ - DlgRef_2Spin_QTD.h \ - DlgRef_3Spin_QTD.h \ - DlgRef_3Spin1Check_QTD.h \ - DlgRef_3Sel3Spin1Check_QTD.h \ - DlgRef_4Sel1Spin2Check_QTD.h \ - DlgRef_SpinBox.h \ - DlgRef_1Sel1Spin.h \ - DlgRef_1Sel2Spin.h \ - DlgRef_1Sel3Spin.h \ - DlgRef_1Sel4Spin.h \ - DlgRef_1Sel5Spin.h \ - DlgRef_2Sel1Spin.h \ - DlgRef_2Sel2Spin.h \ - DlgRef_2Sel3Spin.h \ - DlgRef_1Sel1Spin1Check.h \ - DlgRef_2Sel1Spin2Check.h \ - DlgRef_2Sel2Spin1Check.h \ - DlgRef_2Sel4Spin1Check.h \ - DlgRef_3Sel4Spin2Check.h \ - DlgRef_3Sel3Spin1Check.h \ - DlgRef_1Spin.h \ - DlgRef_2Spin.h \ - DlgRef_3Spin.h \ - DlgRef_3Spin1Check.h \ - DlgRef_3Sel1Spin.h \ - DlgRef_1Sel_Ext.h \ - DlgRef_3Check_QTD.h \ - DlgRef_6Sel_QTD.h \ - DlgRef_4Sel1Spin2Check.h - -# header files -EXPORT_HEADERS= $(LIB_MOC) \ - GEOM_DlgRef.hxx - -LIB_CLIENT_IDL = - -LIB_SERVER_IDL = - -# additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += $(QT_MT_LIBS) $(GUI_LDFLAGS) -lqtx - -@CONCLUDE@ diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am new file mode 100644 index 000000000..2afe2a1a2 --- /dev/null +++ b/src/EntityGUI/Makefile.am @@ -0,0 +1,110 @@ +# GEOM ENTITYGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets +lib_LTLIBRARIES = libEntityGUI.la + +# header files +salomeinclude_HEADERS = \ + GEOM_EntityGUI.hxx + +dist_libEntityGUI_la_SOURCES = EntityGUI.cxx \ + EntityGUI_Skeleton_QTD.cxx \ + EntityGUI_Point_QTD.cxx \ + EntityGUI_Dir1_QTD.cxx \ + EntityGUI_Dir2_QTD.cxx \ + EntityGUI_1Sel_QTD.cxx \ + EntityGUI_1Spin_QTD.cxx \ + EntityGUI_2Spin_QTD.cxx \ + EntityGUI_3Spin_QTD.cxx \ + EntityGUI_4Spin_QTD.cxx \ + EntityGUI_1Spin.cxx \ + EntityGUI_2Spin.cxx \ + EntityGUI_3Spin.cxx \ + EntityGUI_4Spin.cxx \ + EntityGUI_SketcherDlg.cxx \ + EntityGUI_SubShapeDlg.cxx + +MOC_FILES = \ + EntityGUI_Skeleton_QTD_moc.cxx \ + EntityGUI_Point_QTD_moc.cxx \ + EntityGUI_Dir1_QTD_moc.cxx \ + EntityGUI_Dir2_QTD_moc.cxx \ + EntityGUI_1Sel_QTD_moc.cxx \ + EntityGUI_1Spin_QTD_moc.cxx \ + EntityGUI_2Spin_QTD_moc.cxx \ + EntityGUI_3Spin_QTD_moc.cxx \ + EntityGUI_4Spin_QTD_moc.cxx \ + EntityGUI_1Spin_moc.cxx \ + EntityGUI_2Spin_moc.cxx \ + EntityGUI_3Spin_moc.cxx \ + EntityGUI_4Spin_moc.cxx \ + EntityGUI_SketcherDlg_moc.cxx \ + EntityGUI_SubShapeDlg_moc.cxx + +nodist_libEntityGUI_la_SOURCES= \ + $(MOC_FILES) + +# LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl + +# LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libEntityGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(VTK_INCLUDES) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(srcdir)/../SKETCHER \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libEntityGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la \ + ../SKETCHER/libGEOMSketcher.la \ + ../GEOMGUI/libGEOM.la \ + $(QT_MT_LIBS) \ + $(CAS_TKTopAlgo) -lTKernel + diff --git a/src/EntityGUI/Makefile.in b/src/EntityGUI/Makefile.in deleted file mode 100644 index cb3127981..000000000 --- a/src/EntityGUI/Makefile.in +++ /dev/null @@ -1,88 +0,0 @@ -# GEOM ENTITYGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets -LIB = libEntityGUI.la - -# header files -EXPORT_HEADERS= GEOM_EntityGUI.hxx - -LIB_SRC = EntityGUI.cxx \ - EntityGUI_Skeleton_QTD.cxx \ - EntityGUI_Point_QTD.cxx \ - EntityGUI_Dir1_QTD.cxx \ - EntityGUI_Dir2_QTD.cxx \ - EntityGUI_1Sel_QTD.cxx \ - EntityGUI_1Spin_QTD.cxx \ - EntityGUI_2Spin_QTD.cxx \ - EntityGUI_3Spin_QTD.cxx \ - EntityGUI_4Spin_QTD.cxx \ - EntityGUI_1Spin.cxx \ - EntityGUI_2Spin.cxx \ - EntityGUI_3Spin.cxx \ - EntityGUI_4Spin.cxx \ - EntityGUI_SketcherDlg.cxx \ - EntityGUI_SubShapeDlg.cxx - -LIB_MOC = \ - EntityGUI_Skeleton_QTD.h \ - EntityGUI_Point_QTD.h \ - EntityGUI_Dir1_QTD.h \ - EntityGUI_Dir2_QTD.h \ - EntityGUI_1Sel_QTD.h \ - EntityGUI_1Spin_QTD.h \ - EntityGUI_2Spin_QTD.h \ - EntityGUI_3Spin_QTD.h \ - EntityGUI_4Spin_QTD.h \ - EntityGUI_1Spin.h \ - EntityGUI_2Spin.h \ - EntityGUI_3Spin.h \ - EntityGUI_4Spin.h \ - EntityGUI_SketcherDlg.h \ - EntityGUI_SubShapeDlg.h - -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection -lGEOMSketcher -lGEOMBase -lGEOM - -@CONCLUDE@ diff --git a/src/GEOM/Makefile.am b/src/GEOM/Makefile.am new file mode 100644 index 000000000..fa444d3da --- /dev/null +++ b/src/GEOM/Makefile.am @@ -0,0 +1,81 @@ +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets + +lib_LTLIBRARIES = libGEOMbasic.la + +dist_libGEOMbasic_la_SOURCES = \ + GEOM_Application.cxx \ + GEOM_Engine.cxx \ + GEOM_Function.cxx \ + GEOM_Object.cxx \ + GEOM_IOperations.cxx \ + GEOM_Solver.cxx \ + GEOM_SubShapeDriver.cxx \ + GEOM_PythonDump.cxx \ + GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx \ + GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx \ + GEOM_DataMapOfAsciiStringTransient_0.cxx + +#LIB_CLIENT_IDL = +#LIB_SERVER_IDL = + +# Executables targets +#BIN = +#BIN_SRC = +#BIN_CLIENT_IDL = +#BIN_SERVER_IDL = + +# header files +salomeinclude_HEADERS = \ + GEOM_Application.hxx \ + Handle_GEOM_Application.hxx \ + GEOM_Engine.hxx \ + GEOM_Function.hxx \ + GEOM_Object.hxx \ + GEOM_IOperations.hxx \ + GEOM_ISubShape.hxx \ + GEOM_Solver.hxx \ + GEOM_PythonDump.hxx \ + GEOM_DataMapOfAsciiStringTransient.hxx \ + Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx + +# additionnal information to compil and link file +libGEOMbasic_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(top_builddir)/salome_adm/unix + +libGEOMbasic_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKXSBase \ + $(CAS_OCAF) \ + $(CAS_OCAFVIS) diff --git a/src/GEOM/Makefile.in b/src/GEOM/Makefile.in deleted file mode 100644 index 491916459..000000000 --- a/src/GEOM/Makefile.in +++ /dev/null @@ -1,78 +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 -# - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libGEOMbasic.la -LIB_SRC = GEOM_Application.cxx \ - GEOM_Engine.cxx \ - GEOM_Function.cxx \ - GEOM_Object.cxx \ - GEOM_IOperations.cxx \ - GEOM_Solver.cxx \ - GEOM_SubShapeDriver.cxx \ - GEOM_PythonDump.cxx \ - GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx \ - GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx \ - GEOM_DataMapOfAsciiStringTransient_0.cxx - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = - -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -# header files -EXPORT_HEADERS= GEOM_Application.hxx \ - Handle_GEOM_Application.hxx \ - GEOM_Engine.hxx \ - GEOM_Function.hxx \ - GEOM_Object.hxx \ - GEOM_IOperations.hxx \ - GEOM_ISubShape.hxx \ - GEOM_Solver.hxx \ - GEOM_PythonDump.hxx \ - GEOM_DataMapOfAsciiStringTransient.hxx \ - Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx - -# additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_OCAF) $(CAS_OCAFVIS) - - -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = - -@CONCLUDE@ - diff --git a/src/GEOMAlgo/Makefile.in b/src/GEOMAlgo/Makefile.am similarity index 93% rename from src/GEOMAlgo/Makefile.in rename to src/GEOMAlgo/Makefile.am index 5cd728723..99255ce32 100644 --- a/src/GEOMAlgo/Makefile.in +++ b/src/GEOMAlgo/Makefile.am @@ -22,20 +22,17 @@ # # File : Makefile.in # Author : Julia DOROVSKIKH +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets -LIB = libGEOMAlgo.la -LIB_SRC = \ +lib_LTLIBRARIES = libGEOMAlgo.la + +dist_libGEOMAlgo_la_SOURCES = \ BlockFix.cxx \ BlockFix_BlockFixAPI.cxx \ BlockFix_CheckTool.cxx \ @@ -117,8 +114,8 @@ LIB_SRC = \ LIB_CLIENT_IDL = LIB_SERVER_IDL = -# header files -EXPORT_HEADERS = \ +# header files +salomeinclude_HEADERS = \ BlockFix_BlockFixAPI.hxx \ BlockFix_BlockFixAPI.lxx \ BlockFix_CheckTool.hxx \ @@ -206,15 +203,16 @@ EXPORT_HEADERS = \ Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx \ Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx -# idl files -EXPORT_IDLS= +libGEOMAlgo_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../NMTDS \ + -I$(srcdir)/../NMTTools +libGEOMAlgo_la_LDFLAGS = \ + ../NMTTools/libNMTTools.la \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(CAS_LDPATH) -lTKBO $(KERNEL_LDFLAGS) -%_moc.cxx: %.h - $(MOC) $< -o $@ -@CONCLUDE@ diff --git a/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am new file mode 100644 index 000000000..85293c18f --- /dev/null +++ b/src/GEOMBase/Makefile.am @@ -0,0 +1,92 @@ +# GEOM GEOMBASE : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets +lib_LTLIBRARIES = libGEOMBase.la + +# header files +salomeinclude_HEADERS = \ + GEOMBase.h \ + GEOMBase_Skeleton.h \ + GEOMBase_Helper.h \ + GEOM_Operation.h \ + GEOM_GEOMBase.hxx + +dist_libGEOMBase_la_SOURCES = \ + GEOMBase.cxx \ + GEOMBase_Skeleton.cxx \ + GEOMBase_aParameterDlg.cxx \ + GEOMBase_Helper.cxx \ + GEOM_Operation.cxx + +MOC_FILES = \ + GEOMBase_Skeleton_moc.cxx \ + GEOMBase_aParameterDlg_moc.cxx + +nodist_libGEOMBase_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOME_Exception.idl \ +# SALOMEDS.idl \ +# SALOMEDS_Attributes.idl \ +# SALOME_GenericObj.idl \ +# SALOME_Component.idl \ +# GEOM_Gen.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libGEOMBase_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libGEOMBase_la_LDFLAGS = \ + ../../idl/libSalomeIDLGEOM.la \ + ../GEOMGUI/libGEOM.la \ + ../DlgRef/libDlgRef.la \ + $(KERNEL_LDFLAGS) -lOpUtil \ + $(GUI_LDFLAGS) -lsuit -lOCCViewer -lVTKViewer -lSVTK -lSalomePrs -lSalomeApp -lCAM \ + $(CAS_LDPATH) -lTKPrim diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in deleted file mode 100644 index 4bdc8b6b1..000000000 --- a/src/GEOMBase/Makefile.in +++ /dev/null @@ -1,73 +0,0 @@ -# GEOM GEOMBASE : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets -LIB = libGEOMBase.la - -# header files -EXPORT_HEADERS= GEOMBase.h \ - GEOMBase_Skeleton.h \ - GEOMBase_Helper.h \ - GEOM_Operation.h \ - GEOM_GEOMBase.hxx - -LIB_SRC = GEOMBase.cxx \ - GEOMBase_Skeleton.cxx \ - GEOMBase_aParameterDlg.cxx \ - GEOMBase_Helper.cxx \ - GEOM_Operation.cxx - -LIB_MOC = \ - GEOMBase_Skeleton.h \ - GEOMBase_aParameterDlg.h - -LIB_CLIENT_IDL = SALOME_Exception.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_GenericObj.idl \ - SALOME_Component.idl \ - GEOM_Gen.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim - -@CONCLUDE@ diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.am similarity index 67% rename from src/GEOMClient/Makefile.in rename to src/GEOMClient/Makefile.am index 742c633c3..e71d2bb7e 100644 --- a/src/GEOMClient/Makefile.in +++ b/src/GEOMClient/Makefile.am @@ -23,40 +23,36 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS = \ - GEOM_Client.hxx +salomeinclude_HEADERS = \ + GEOM_Client.hxx -# Libraries targets -LIB = libGEOMClient.la -LIB_SRC = GEOM_Client.cxx -LIB_SERVER_IDL = \ - SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj.idl \ - GEOM_Gen.idl +# Libraries targets +lib_LTLIBRARIES = libGEOMClient.la -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = +# Sources files +dist_libGEOMClient_la_SOURCES = \ + GEOM_Client.cxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(CAS_TKTopAlgo) $(KERNEL_LDFLAGS) - - -@CONCLUDE@ +libGEOMClient_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libGEOMClient_la_LDFLAGS = \ + ../../idl/libSalomeIDLGEOM.la \ + ../GEOM/libGEOMbasic.la \ + $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil \ + $(CAS_TKTopAlgo) \ + $(CORBA_LIBS) \ + $(STDLIB) diff --git a/src/GEOMFiltersSelection/Makefile.am b/src/GEOMFiltersSelection/Makefile.am new file mode 100644 index 000000000..43f5b0d17 --- /dev/null +++ b/src/GEOMFiltersSelection/Makefile.am @@ -0,0 +1,75 @@ +# GEOM GEOMFiltersSelection : filter selector for the 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) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets +lib_LTLIBRARIES = libGEOMFiltersSelection.la + +# header files +salomeinclude_HEADERS = \ + GEOM_SelectionFilter.h \ + GEOM_EdgeFilter.h \ + GEOM_FaceFilter.h \ + GEOM_TypeFilter.h \ + GEOM_PreviewFilter.h \ + GEOM_LogicalFilter.h \ + GEOM_OCCFilter.h + +# Sources +dist_libGEOMFiltersSelection_la_SOURCES = \ + GEOM_SelectionFilter.cxx \ + GEOM_EdgeFilter.cxx \ + GEOM_FaceFilter.cxx \ + GEOM_TypeFilter.cxx \ + GEOM_PreviewFilter.cxx \ + GEOM_LogicalFilter.cxx \ + GEOM_OCCFilter.cxx + +# LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl + + +# additionnal information to compil and link file +libGEOMFiltersSelection_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(GUI_CXXFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMClient \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libGEOMFiltersSelection_la_LDFLAGS = \ + ../../idl/libSalomeIDLGEOM.la \ + ../GEOMClient/libGEOMClient.la \ + $(GUI_LDFLAGS) -lsuit -lSalomeApp -lSalomeSession \ + $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeContainer -lTOOLSDS diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in deleted file mode 100644 index def76cb9f..000000000 --- a/src/GEOMFiltersSelection/Makefile.in +++ /dev/null @@ -1,70 +0,0 @@ -# GEOM GEOMFiltersSelection : filter selector for the 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 : GEOM -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libGEOMFiltersSelection.la -LIB_SRC = GEOM_SelectionFilter.cxx \ - GEOM_EdgeFilter.cxx \ - GEOM_FaceFilter.cxx \ - GEOM_TypeFilter.cxx \ - GEOM_PreviewFilter.cxx \ - GEOM_LogicalFilter.cxx \ - GEOM_OCCFilter.cxx - -# header files -EXPORT_HEADERS= GEOM_SelectionFilter.h \ - GEOM_EdgeFilter.h \ - GEOM_FaceFilter.h \ - GEOM_TypeFilter.h \ - GEOM_PreviewFilter.h \ - GEOM_LogicalFilter.h \ - GEOM_OCCFilter.h - -LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl - - -# additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(GUI_LDFLAGS) $(KERNEL_LDFLAGS) -lsuit -lSalomeApp - -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = - -@CONCLUDE@ diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am new file mode 100644 index 000000000..798553d30 --- /dev/null +++ b/src/GEOMGUI/Makefile.am @@ -0,0 +1,104 @@ +# GEOM GEOMGUI : GUI for Geometry 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 : Marc Tajchman (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets +lib_LTLIBRARIES = libGEOM.la + +# header files +salomeinclude_HEADERS = \ + GeometryGUI.h \ + GEOMGUI.h \ + GEOM_Displayer.h \ + GEOMGUI_OCCSelector.h \ + GEOMGUI_Selection.h \ + GeometryGUI_Swig.hxx \ + GeometryGUI_Swig.i \ + GEOM_GEOMGUI.hxx + +dist_libGEOM_la_SOURCES = \ + GeometryGUI.cxx \ + GEOMGUI.cxx \ + GEOM_Displayer.cxx \ + GEOMGUI_OCCSelector.cxx \ + GEOMGUI_Selection.cxx \ + GeometryGUI_Swig.cxx + +MOC_FILES = \ + GeometryGUI_moc.cxx + + +nodist_libGEOM_la_SOURCES= \ + $(MOC_FILES) + +# resources files +nodist_salomeres_DATA= \ + GEOM_images.qm \ + GEOM_msg_en.qm \ + GEOM_msg_fr.qm + +#LIB_CLIENT_IDL = SALOME_Exception.idl \ +# SALOMEDS.idl \ +# SALOMEDS_Attributes.idl \ +# SALOME_GenericObj.idl \ +# SALOME_Component.idl \ +# GEOM_Gen.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libGEOM_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libGEOM_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMClient/libGEOMClient.la \ + ../OBJECT/libGEOMObject.la \ + $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA \ + $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lCAM -lSOCC -lSVTK -lEvent +# -lSalomeApp +# -lToolsGUI +# $(CORBA_LIBS) \ +# $(STDLIB) diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in deleted file mode 100644 index 473e562c1..000000000 --- a/src/GEOMGUI/Makefile.in +++ /dev/null @@ -1,80 +0,0 @@ -# GEOM GEOMGUI : GUI for Geometry 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 : Marc Tajchman (CEA) -# Module : GEOM -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# ressources files -PO_FILES = \ - GEOM_images.po \ - GEOM_msg_en.po \ - GEOM_msg_fr.po - -# header files -EXPORT_HEADERS= GeometryGUI.h \ - GEOMGUI.h \ - GEOM_Displayer.h \ - GEOMGUI_OCCSelector.h \ - GEOMGUI_Selection.h \ - GeometryGUI_Swig.hxx \ - GeometryGUI_Swig.i \ - GEOM_GEOMGUI.hxx - -# Libraries targets -LIB = libGEOM.la -LIB_SRC = GeometryGUI.cxx \ - GEOMGUI.cxx \ - GEOM_Displayer.cxx \ - GEOMGUI_OCCSelector.cxx \ - GEOMGUI_Selection.cxx \ - GeometryGUI_Swig.cxx - -LIB_MOC = GeometryGUI.h \ - -LIB_CLIENT_IDL = SALOME_Exception.idl \ - SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_GenericObj.idl \ - SALOME_Component.idl \ - GEOM_Gen.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI -lEvent - -@CONCLUDE@ diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am new file mode 100644 index 000000000..fd4f9639d --- /dev/null +++ b/src/GEOMImpl/Makefile.am @@ -0,0 +1,133 @@ +# GEOM GEOM : implementaion of GEOM_Gen.idl +# +# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + +# File : Makefile.in +# Author : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets + +lib_LTLIBRARIES = libGEOMimpl.la + +# header files +salomeinclude_HEADERS = \ + GEOMImpl_Gen.hxx \ + GEOMImpl_IBasicOperations.hxx \ + GEOMImpl_ITransformOperations.hxx \ + GEOMImpl_IHealingOperations.hxx \ + GEOMImpl_I3DPrimOperations.hxx \ + GEOMImpl_IShapesOperations.hxx \ + GEOMImpl_IBlocksOperations.hxx \ + GEOMImpl_IBooleanOperations.hxx \ + GEOMImpl_ICurvesOperations.hxx \ + GEOMImpl_ILocalOperations.hxx \ + GEOMImpl_IInsertOperations.hxx \ + GEOMImpl_IMeasureOperations.hxx \ + GEOMImpl_IGroupOperations.hxx \ + GEOMImpl_CopyDriver.hxx \ + GEOMImpl_Types.hxx \ + GEOM_GEOMImpl.hxx + +dist_libGEOMimpl_la_SOURCES = \ + GEOMImpl_IBasicOperations.cxx \ + GEOMImpl_ITransformOperations.cxx \ + GEOMImpl_IHealingOperations.cxx \ + GEOMImpl_I3DPrimOperations.cxx \ + GEOMImpl_IShapesOperations.cxx \ + GEOMImpl_IBlocksOperations.cxx \ + GEOMImpl_IBooleanOperations.cxx \ + GEOMImpl_ICurvesOperations.cxx \ + GEOMImpl_ILocalOperations.cxx \ + GEOMImpl_IInsertOperations.cxx \ + GEOMImpl_IMeasureOperations.cxx \ + GEOMImpl_IGroupOperations.cxx \ + GEOMImpl_Gen.cxx \ + GEOMImpl_PointDriver.cxx \ + GEOMImpl_VectorDriver.cxx \ + GEOMImpl_LineDriver.cxx \ + GEOMImpl_PlaneDriver.cxx \ + GEOMImpl_MarkerDriver.cxx \ + GEOMImpl_TranslateDriver.cxx \ + GEOMImpl_MirrorDriver.cxx \ + GEOMImpl_OffsetDriver.cxx \ + GEOMImpl_ScaleDriver.cxx \ + GEOMImpl_PositionDriver.cxx \ + GEOMImpl_BoxDriver.cxx \ + GEOMImpl_ConeDriver.cxx \ + GEOMImpl_CylinderDriver.cxx \ + GEOMImpl_SphereDriver.cxx \ + GEOMImpl_TorusDriver.cxx \ + GEOMImpl_PrismDriver.cxx \ + GEOMImpl_PipeDriver.cxx \ + GEOMImpl_ThruSectionsDriver.cxx \ + GEOMImpl_RevolutionDriver.cxx \ + GEOMImpl_ShapeDriver.cxx \ + GEOMImpl_BlockDriver.cxx \ + GEOMImpl_Block6Explorer.cxx \ + GEOMImpl_MeasureDriver.cxx \ + GEOMImpl_PolylineDriver.cxx \ + GEOMImpl_CircleDriver.cxx \ + GEOMImpl_EllipseDriver.cxx \ + GEOMImpl_ArcDriver.cxx \ + GEOMImpl_SplineDriver.cxx \ + GEOMImpl_SketcherDriver.cxx \ + GEOMImpl_FilletDriver.cxx \ + GEOMImpl_ChamferDriver.cxx \ + GEOMImpl_BooleanDriver.cxx \ + GEOMImpl_PartitionDriver.cxx \ + GEOMImpl_CopyDriver.cxx \ + GEOMImpl_ExportDriver.cxx \ + GEOMImpl_ImportDriver.cxx \ + GEOMImpl_RotateDriver.cxx \ + GEOMImpl_ArchimedeDriver.cxx \ + GEOMImpl_HealingDriver.cxx \ + GEOMImpl_FillingDriver.cxx \ + GEOMImpl_GlueDriver.cxx + +# additionnal information to compil and link file +libGEOMimpl_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../ShHealOper \ + -I$(srcdir)/../NMTAlgo \ + -I$(srcdir)/../NMTTools \ + -I$(srcdir)/../GEOM \ + -I$(srcdir)/../GEOMAlgo \ + -I$(srcdir)/../SKETCHER \ + -I$(srcdir)/../ARCHIMEDE \ + -I$(top_builddir)/salome_adm/unix + +libGEOMimpl_la_LDFLAGS = \ + ../GEOM/libGEOMbasic.la \ + ../NMTAlgo/libNMTAlgo.la \ + ../GEOMAlgo/libGEOMAlgo.la \ + ../ShHealOper/libShHealOper.la \ + ../ARCHIMEDE/libGEOMArchimede.la \ + ../SKETCHER/libGEOMSketcher.la \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset + diff --git a/src/GEOMImpl/Makefile.in b/src/GEOMImpl/Makefile.in deleted file mode 100644 index 0e6263654..000000000 --- a/src/GEOMImpl/Makefile.in +++ /dev/null @@ -1,127 +0,0 @@ -# GEOM GEOM : implementaion of GEOM_Gen.idl -# -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libGEOMimpl.la -LIB_SRC = GEOMImpl_IBasicOperations.cxx \ - GEOMImpl_ITransformOperations.cxx \ - GEOMImpl_IHealingOperations.cxx \ - GEOMImpl_I3DPrimOperations.cxx \ - GEOMImpl_IShapesOperations.cxx \ - GEOMImpl_IBlocksOperations.cxx \ - GEOMImpl_IBooleanOperations.cxx \ - GEOMImpl_ICurvesOperations.cxx \ - GEOMImpl_ILocalOperations.cxx \ - GEOMImpl_IInsertOperations.cxx \ - GEOMImpl_IMeasureOperations.cxx \ - GEOMImpl_IGroupOperations.cxx \ - GEOMImpl_Gen.cxx \ - GEOMImpl_PointDriver.cxx \ - GEOMImpl_VectorDriver.cxx \ - GEOMImpl_LineDriver.cxx \ - GEOMImpl_PlaneDriver.cxx \ - GEOMImpl_MarkerDriver.cxx \ - GEOMImpl_TranslateDriver.cxx \ - GEOMImpl_MirrorDriver.cxx \ - GEOMImpl_OffsetDriver.cxx \ - GEOMImpl_ScaleDriver.cxx \ - GEOMImpl_PositionDriver.cxx \ - GEOMImpl_BoxDriver.cxx \ - GEOMImpl_ConeDriver.cxx \ - GEOMImpl_CylinderDriver.cxx \ - GEOMImpl_SphereDriver.cxx \ - GEOMImpl_TorusDriver.cxx \ - GEOMImpl_PrismDriver.cxx \ - GEOMImpl_PipeDriver.cxx \ - GEOMImpl_ThruSectionsDriver.cxx \ - GEOMImpl_RevolutionDriver.cxx \ - GEOMImpl_ShapeDriver.cxx \ - GEOMImpl_BlockDriver.cxx \ - GEOMImpl_Block6Explorer.cxx \ - GEOMImpl_MeasureDriver.cxx \ - GEOMImpl_PolylineDriver.cxx \ - GEOMImpl_CircleDriver.cxx \ - GEOMImpl_EllipseDriver.cxx \ - GEOMImpl_ArcDriver.cxx \ - GEOMImpl_SplineDriver.cxx \ - GEOMImpl_SketcherDriver.cxx \ - GEOMImpl_FilletDriver.cxx \ - GEOMImpl_ChamferDriver.cxx \ - GEOMImpl_BooleanDriver.cxx \ - GEOMImpl_PartitionDriver.cxx \ - GEOMImpl_CopyDriver.cxx \ - GEOMImpl_ExportDriver.cxx \ - GEOMImpl_ImportDriver.cxx \ - GEOMImpl_RotateDriver.cxx \ - GEOMImpl_ArchimedeDriver.cxx \ - GEOMImpl_HealingDriver.cxx \ - GEOMImpl_FillingDriver.cxx \ - GEOMImpl_GlueDriver.cxx - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = - -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -# header files -EXPORT_HEADERS= GEOMImpl_Gen.hxx \ - GEOMImpl_IBasicOperations.hxx \ - GEOMImpl_ITransformOperations.hxx \ - GEOMImpl_IHealingOperations.hxx \ - GEOMImpl_I3DPrimOperations.hxx \ - GEOMImpl_IShapesOperations.hxx \ - GEOMImpl_IBlocksOperations.hxx \ - GEOMImpl_IBooleanOperations.hxx \ - GEOMImpl_ICurvesOperations.hxx \ - GEOMImpl_ILocalOperations.hxx \ - GEOMImpl_IInsertOperations.hxx \ - GEOMImpl_IMeasureOperations.hxx \ - GEOMImpl_IGroupOperations.hxx \ - GEOMImpl_CopyDriver.hxx \ - GEOMImpl_Types.hxx \ - GEOM_GEOMImpl.hxx - -# additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper - - -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = - -@CONCLUDE@ - diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am new file mode 100644 index 000000000..55acdfefd --- /dev/null +++ b/src/GEOMToolsGUI/Makefile.am @@ -0,0 +1,79 @@ +# GEOM GEOMTOOLSGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets +lib_LTLIBRARIES = libGEOMToolsGUI.la + +# header files +salomeinclude_HEADERS = + +dist_libGEOMToolsGUI_la_SOURCES = \ + GEOMToolsGUI.cxx \ + GEOMToolsGUI_1.cxx \ + GEOMToolsGUI_TransparencyDlg.cxx \ + GEOMToolsGUI_NbIsosDlg.cxx + +MOC_FILES = \ + GEOMToolsGUI_TransparencyDlg_moc.cxx \ + GEOMToolsGUI_NbIsosDlg_moc.cxx + +nodist_libGEOMToolsGUI_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \ +# SALOME_GenericObj.idl \ +# SALOME_Exception.idl \ +# SALOME_Component.idl + +#LIB_SERVER_IDL = + +# additionnal information to compile and link file +libGEOMToolsGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../GEOMClient \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libGEOMToolsGUI_la_LDFLAGS = \ + ../GEOMBase/libGEOMBase.la \ + ../GEOMGUI/libGEOM.la \ + $(GUI_LDFLAGS) -lVTKViewer -lOCCViewer -lsuit -lSalomeApp diff --git a/src/GEOMToolsGUI/Makefile.in b/src/GEOMToolsGUI/Makefile.in deleted file mode 100644 index f5fcab3e9..000000000 --- a/src/GEOMToolsGUI/Makefile.in +++ /dev/null @@ -1,65 +0,0 @@ -# GEOM GEOMTOOLSGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets -LIB = libGEOMToolsGUI.la - -# header files -EXPORT_HEADERS = - -LIB_SRC = GEOMToolsGUI.cxx \ - GEOMToolsGUI_1.cxx \ - GEOMToolsGUI_TransparencyDlg.cxx \ - GEOMToolsGUI_NbIsosDlg.cxx - -LIB_MOC = GEOMToolsGUI_TransparencyDlg.h \ - GEOMToolsGUI_NbIsosDlg.h - -LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \ - SALOME_GenericObj.idl \ - SALOME_Exception.idl \ - SALOME_Component.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp - -@CONCLUDE@ diff --git a/src/GEOM_I/Makefile.in b/src/GEOM_I/Makefile.am similarity index 51% rename from src/GEOM_I/Makefile.in rename to src/GEOM_I/Makefile.am index abed346f7..7915c62bb 100644 --- a/src/GEOM_I/Makefile.in +++ b/src/GEOM_I/Makefile.am @@ -23,20 +23,35 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets +lib_LTLIBRARIES = libGEOMEngine.la + +# header files +salomeinclude_HEADERS = \ + GEOM_Object_i.hh \ + GEOM_IOperations_i.hh \ + GEOM_IBasicOperations_i.hh \ + GEOM_IHealingOperations_i.hh \ + GEOM_I3DPrimOperations_i.hh \ + GEOM_IShapesOperations_i.hh \ + GEOM_IBlocksOperations_i.hh \ + GEOM_IBooleanOperations_i.hh \ + GEOM_ICurvesOperations_i.hh \ + GEOM_ILocalOperations_i.hh \ + GEOM_IInsertOperations_i.hh \ + GEOM_ITransformOperations_i.hh \ + GEOM_IMeasureOperations_i.hh \ + GEOM_IGroupOperations_i.hh \ + GEOM_Gen_i.hh \ + GEOM_GEOM_I.hxx -LIB = libGEOMEngine.la -LIB_SRC = \ +dist_libGEOMEngine_la_SOURCES = \ GEOM_Object_i.cc \ GEOM_IOperations_i.cc \ GEOM_IBasicOperations_i.cc \ @@ -54,46 +69,30 @@ LIB_SRC = \ GEOM_Gen_i.cc \ GEOM_DumpPython.cc -# SALOME_Component.idl -LIB_CLIENT_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Exception.idl SALOME_GenericObj.idl - #SALOME_Exception.idl SALOME_GenericObj.idl - -LIB_SERVER_IDL = GEOM_Gen.idl - -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -#This export required to compile GEOM_Superv_i.lo library -EXPORT_HEADERS = GEOM_Object_i.hh \ - GEOM_IOperations_i.hh \ - GEOM_IBasicOperations_i.hh \ - GEOM_IHealingOperations_i.hh \ - GEOM_I3DPrimOperations_i.hh \ - GEOM_IShapesOperations_i.hh \ - GEOM_IBlocksOperations_i.hh \ - GEOM_IBooleanOperations_i.hh \ - GEOM_ICurvesOperations_i.hh \ - GEOM_ILocalOperations_i.hh \ - GEOM_IInsertOperations_i.hh \ - GEOM_ITransformOperations_i.hh \ - GEOM_IMeasureOperations_i.hh \ - GEOM_IGroupOperations_i.hh \ - GEOM_Gen_i.hh \ - GEOM_GEOM_I.hxx - # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += -lGEOMArchimede -lGEOMbasic -lGEOMimpl -lGEOMSketcher \ - $(CAS_DATAEXCHANGE) $(CAS_LDPATH) -lTKFillet -lTKOffset \ - $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS +libGEOMEngine_la_CPPFLAGS = \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../SKETCHER \ + -I$(srcdir)/../ARCHIMEDE \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMAlgo \ + -I$(srcdir)/../GEOM \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = -@CONCLUDE@ +libGEOMEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLGEOM.la \ + ../ARCHIMEDE/libGEOMArchimede.la \ + ../GEOMImpl/libGEOMimpl.la \ + ../SKETCHER/libGEOMSketcher.la \ + ../GEOM/libGEOMbasic.la \ + $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ + $(CAS_DATAEXCHANGE) \ + $(CAS_LDPATH) -lTKFillet -lTKOffset \ + $(STDLIB) \ + $(CORBA_LIBS) diff --git a/src/GEOM_I_Superv/Makefile.in b/src/GEOM_I_Superv/Makefile.am similarity index 51% rename from src/GEOM_I_Superv/Makefile.in rename to src/GEOM_I_Superv/Makefile.am index 5657aa070..4a97945b0 100644 --- a/src/GEOM_I_Superv/Makefile.in +++ b/src/GEOM_I_Superv/Makefile.am @@ -23,42 +23,46 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +# Libraries targets + +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +# header files +salomeinclude_HEADERS = # Libraries targets +lib_LTLIBRARIES = libGEOM_SupervEngine.la -LIB = libGEOM_SupervEngine.la -LIB_SRC = \ +dist_libGEOM_SupervEngine_la_SOURCES = \ GEOM_Superv_i.cc -LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Exception.idl \ - SALOME_GenericObj.idl SALOME_ModuleCatalog.idl SALOME_Session.idl GEOM_Gen.idl GEOM_Superv.idl \ - -# Executables targets -BIN = -BIN_SRC = -BIN_CLIENT_IDL = -BIN_SERVER_IDL = - -EXPORT_HEADERS = +#LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Exception.idl \ +# SALOME_GenericObj.idl SALOME_ModuleCatalog.idl SALOME_Session.idl GEOM_Gen.idl GEOM_Superv.idl # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer $(KERNEL_LDFLAGS) -lSalomeGenericObj - -# additional file to be cleaned -MOSTLYCLEAN = -CLEAN = -DISTCLEAN = - -@CONCLUDE@ +libGEOM_SupervEngine_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(QT_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOM \ + -I$(srcdir)/../GEOM_I \ + -I$(srcdir)/../GEOMAlgo \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix +libGEOM_SupervEngine_la_LDFLAGS = \ + ../GEOM_I/libGEOMEngine.la \ + $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient \ + $(CORBA_LIBS) \ + $(STDLIB) diff --git a/src/GEOM_SWIG/Makefile.am b/src/GEOM_SWIG/Makefile.am new file mode 100644 index 000000000..ca0cdbb50 --- /dev/null +++ b/src/GEOM_SWIG/Makefile.am @@ -0,0 +1,164 @@ +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# +# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.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 : GEOM +# $Header$ + + +# Libraries targets + +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)/../GEOMGUI + +SWIG_SOURCES = libGEOM_Swig.i + +# Libraries targets +lib_LTLIBRARIES = libGEOM_Swigcmodule.la + +nodist_pkgpython_DATA = libGEOM_Swig.py +libGEOM_Swig.py: swig_wrap.cpp + +libGEOM_Swigcmodule_la_SOURCES = \ + $(BUILT_SOURCES) \ + $(SWIG_SOURCES) + +nodist_libGEOM_Swigcmodule_la_SOURCES = swig_wrap.cpp + +#LIB_CLIENT_IDL = SALOMEDS.idl \ +# SALOMEDS_Attributes.idl \ +# SALOME_Exception.idl \ +# GEOM_Gen.idl \ +# SALOME_Component.idl \ +# SALOME_GenericObj.idl + +EXPORT_SHAREDPYSCRIPTS=\ + GEOM_shared_modules.py + +libGEOM_Swigcmodule_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(VTK_INCLUDES) \ + $(OGL_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libGEOM_Swigcmodule_la_LDFLAGS = \ + ../GEOMGUI/libGEOM.la + + +libGEOM_Swigcmodule_la_LIBADD = \ + $(PYTHON_LIBS) + +swig_wrap.cpp : $(SWIG_SOURCES) + $(SWIG) $(SWIG_FLAGS) -o $@ $< + +CLEANFILES = \ + swig_wrap.cpp + +# +# =============================================================== +# Files to be installed +# =============================================================== +# + +# Scripts to be installed. +dist_salomescript_DATA= \ + libGEOM_Swig.py \ + geompy.py \ + batchmode_geompy.py \ + GEOM_Spanner.py \ + GEOM_blocks.py \ + GEOM_example.py \ + GEOM_example2.py \ + GEOM_example3.py \ + GEOM_example4.py \ + GEOM_example5.py \ + GEOM_moteur.py \ + GEOM_TestAll.py \ + GEOM_TestOthers.py \ + GEOM_TestHealing.py \ + GEOM_TestMeasures.py \ + GEOM_usinggeom.py \ + GEOM_Partition1.py \ + GEOM_Partition2.py \ + GEOM_Partition3.py \ + GEOM_Partition4.py \ + GEOM_Partition5.py \ + GEOM_cyl2complementary.py \ + GEOM_shellSolid.py \ + GEOM_tube_geom.py \ + GEOM_tube_geom_gg2.py \ + GEOM_Nut.py \ + GEOM_Sketcher.py \ + PAL_MESH_019_020_geometry.py \ + PAL_MESH_028_geometry.py \ + PAL_MESH_030_geometry.py \ + PAL_MESH_033_geometry.py \ + PAL_MESH_035_geometry.py + +sharedpkgpython_PYTHON = \ + GEOM_shared_modules.py + +install-exec-hook:\ + $(libdir)/_libGEOM_Swig.so + +$(libdir)/_libGEOM_Swig.so: + ln -sf $(libdir)/libGEOM_Swigcmodule.so $@ diff --git a/src/GEOM_SWIG/Makefile.in b/src/GEOM_SWIG/Makefile.in deleted file mode 100644 index 9c593fc92..000000000 --- a/src/GEOM_SWIG/Makefile.in +++ /dev/null @@ -1,91 +0,0 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python -# -# Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, -# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# -# -# File : Makefile.in -# Author : Nicolas REJNERI, Paul RASCLE -# Module : GEOM -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# Libraries targets - -LIB = libGEOM_Swigcmodule.la -LIB_SRC = - -SWIG_DEF = libGEOM_Swig.i -EXPORT_PYSCRIPTS = \ - libGEOM_Swig.py \ - geompy.py \ - batchmode_geompy.py \ - GEOM_Spanner.py \ - GEOM_blocks.py \ - GEOM_example.py \ - GEOM_example2.py \ - GEOM_example3.py \ - GEOM_example4.py \ - GEOM_example5.py \ - GEOM_moteur.py \ - GEOM_TestAll.py \ - GEOM_TestOthers.py \ - GEOM_TestHealing.py \ - GEOM_TestMeasures.py \ - GEOM_usinggeom.py \ - GEOM_Partition1.py \ - GEOM_Partition2.py \ - GEOM_Partition3.py \ - GEOM_Partition4.py \ - GEOM_Partition5.py \ - GEOM_cyl2complementary.py \ - GEOM_shellSolid.py \ - GEOM_tube_geom.py \ - GEOM_tube_geom_gg2.py \ - GEOM_Nut.py \ - GEOM_Sketcher.py \ - PAL_MESH_019_020_geometry.py \ - PAL_MESH_028_geometry.py \ - PAL_MESH_030_geometry.py \ - PAL_MESH_033_geometry.py \ - PAL_MESH_035_geometry.py - -LIB_CLIENT_IDL = SALOMEDS.idl \ - SALOMEDS_Attributes.idl \ - SALOME_Exception.idl \ - GEOM_Gen.idl \ - SALOME_Component.idl \ - SALOME_GenericObj.idl - -EXPORT_SHAREDPYSCRIPTS=\ - GEOM_shared_modules.py - -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -DHAVE_CONFIG_H -LIBS+= $(PYTHON_LIBS) -LDFLAGS+= -lGEOM - -@CONCLUDE@ diff --git a/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am new file mode 100644 index 000000000..d7885317f --- /dev/null +++ b/src/GenerationGUI/Makefile.am @@ -0,0 +1,83 @@ +# GEOM GENERATIONGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# Libraries targets +lib_LTLIBRARIES = libGenerationGUI.la + +# header files +salomeinclude_HEADERS = + +dist_libGenerationGUI_la_SOURCES = \ + GenerationGUI.cxx \ + GenerationGUI_PrismDlg.cxx \ + GenerationGUI_RevolDlg.cxx \ + GenerationGUI_FillingDlg.cxx \ + GenerationGUI_PipeDlg.cxx + +MOC_FILES = \ + GenerationGUI_PrismDlg_moc.cxx \ + GenerationGUI_RevolDlg_moc.cxx \ + GenerationGUI_FillingDlg_moc.cxx \ + GenerationGUI_PipeDlg_moc.cxx + +nodist_libGenerationGUI_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libGenerationGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libGenerationGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la \ + $(CAS_LDPATH) -lTKOffset diff --git a/src/GenerationGUI/Makefile.in b/src/GenerationGUI/Makefile.in deleted file mode 100644 index 47286a828..000000000 --- a/src/GenerationGUI/Makefile.in +++ /dev/null @@ -1,66 +0,0 @@ -# GEOM GENERATIONGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# Libraries targets -LIB = libGenerationGUI.la - -LIB_SRC = GenerationGUI.cxx \ - GenerationGUI_PrismDlg.cxx \ - GenerationGUI_RevolDlg.cxx \ - GenerationGUI_FillingDlg.cxx \ - GenerationGUI_PipeDlg.cxx - -LIB_MOC = \ - GenerationGUI_PrismDlg.h \ - GenerationGUI_RevolDlg.h \ - GenerationGUI_FillingDlg.h \ - GenerationGUI_PipeDlg.h - -LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection -lGEOMBase $(CAS_LDPATH) -lTKOffset - -@CONCLUDE@ diff --git a/src/GroupGUI/Makefile.in b/src/GroupGUI/Makefile.am similarity index 51% rename from src/GroupGUI/Makefile.in rename to src/GroupGUI/Makefile.am index 22a80ca16..101b660f7 100755 --- a/src/GroupGUI/Makefile.in +++ b/src/GroupGUI/Makefile.am @@ -23,38 +23,55 @@ # # File : Makefile.in # Author : Sergey ANIKIN (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ +# Libraries targets +lib_LTLIBRARIES = libGroupGUI.la # header files -EXPORT_HEADERS= +salomeinclude_HEADERS = -# Libraries targets -LIB = libGroupGUI.la +dist_libGroupGUI_la_SOURCES = \ + GroupGUI.cxx \ + GroupGUI_GroupDlg.cxx -LIB_SRC = GroupGUI.cxx \ - GroupGUI_GroupDlg.cxx +MOC_FILES = \ + GroupGUI_moc.cxx \ + GroupGUI_GroupDlg_moc.cxx -LIB_MOC = GroupGUI.h \ - GroupGUI_GroupDlg.h +nodist_libGroupGUI_la_SOURCES= \ + $(MOC_FILES) -LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl +# LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl -LIB_SERVER_IDL = +# LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection -lGEOMBase +libGroupGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix -@CONCLUDE@ +libGroupGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la diff --git a/src/BREPExport/Makefile.in b/src/IGESExport/Makefile.am similarity index 72% rename from src/BREPExport/Makefile.in rename to src/IGESExport/Makefile.am index 1545fe667..8eb7a855d 100644 --- a/src/BREPExport/Makefile.in +++ b/src/IGESExport/Makefile.am @@ -20,28 +20,24 @@ # # File : Makefile.in # Author : Pavel TELKOV +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -EXPORT_HEADERS= +include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets +lib_LTLIBRARIES = libIGESExport.la -LIB = libBREPExport.la - -LIB_SRC = BREPExport.cxx +dist_libIGESExport_la_SOURCES = \ + IGESExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS) - -@CONCLUDE@ +libIGESExport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) + +libIGESExport_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKIGES \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace diff --git a/src/IGESExport/Makefile.in b/src/IGESImport/Makefile.am similarity index 72% rename from src/IGESExport/Makefile.in rename to src/IGESImport/Makefile.am index 123cc6b23..9675012eb 100644 --- a/src/IGESExport/Makefile.in +++ b/src/IGESImport/Makefile.am @@ -20,26 +20,24 @@ # # File : Makefile.in # Author : Pavel TELKOV +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am # Libraries targets +lib_LTLIBRARIES = libIGESImport.la -LIB= libIGESExport.la - -LIB_SRC = IGESExport.cxx +dist_libIGESImport_la_SOURCES = \ + IGESImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS) - -@CONCLUDE@ +libIGESImport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) + +libIGESImport_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKIGES \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace diff --git a/src/Makefile.in b/src/Makefile.am similarity index 92% rename from src/Makefile.in rename to src/Makefile.am index 3129cc267..374eee802 100644 --- a/src/Makefile.in +++ b/src/Makefile.am @@ -19,19 +19,10 @@ # # # -# File : Makefile.in +# File : Makefile.am # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - SUBDIRS = OBJECT ARCHIMEDE NMTDS NMTTools NMTAlgo GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport ShHealOper GEOMImpl GEOM_I GEOMClient DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_I_Superv GEOM_SWIG - -@MODULE@ diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am new file mode 100644 index 000000000..c1a3d62a3 --- /dev/null +++ b/src/MeasureGUI/Makefile.am @@ -0,0 +1,107 @@ +# GEOM MEASUREGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libMeasureGUI.la + +dist_libMeasureGUI_la_SOURCES = \ + MeasureGUI.cxx \ + MeasureGUI_Skeleton_QTD.cxx \ + MeasureGUI_1Sel3LineEdit_QTD.cxx \ + MeasureGUI_1Sel6LineEdit_QTD.cxx \ + MeasureGUI_1Sel12LineEdit_QTD.cxx \ + MeasureGUI_1Sel1TextView_QTD.cxx \ + MeasureGUI_2Sel1LineEdit_QTD.cxx \ + MeasureGUI_Skeleton.cxx \ + MeasureGUI_PropertiesDlg.cxx \ + MeasureGUI_CenterMassDlg.cxx \ + MeasureGUI_InertiaDlg.cxx \ + MeasureGUI_BndBoxDlg.cxx \ + MeasureGUI_DistanceDlg.cxx \ + MeasureGUI_MaxToleranceDlg.cxx \ + MeasureGUI_WhatisDlg.cxx \ + MeasureGUI_CheckShapeDlg.cxx \ + MeasureGUI_CheckCompoundOfBlocksDlg.cxx \ + MeasureGUI_PointDlg.cxx + +MOC_FILES = \ + MeasureGUI_Skeleton_QTD_moc.cxx \ + MeasureGUI_1Sel3LineEdit_QTD_moc.cxx \ + MeasureGUI_1Sel6LineEdit_QTD_moc.cxx \ + MeasureGUI_1Sel12LineEdit_QTD_moc.cxx \ + MeasureGUI_1Sel1TextView_QTD_moc.cxx \ + MeasureGUI_2Sel1LineEdit_QTD_moc.cxx \ + MeasureGUI_Skeleton_moc.cxx \ + MeasureGUI_PropertiesDlg_moc.cxx \ + MeasureGUI_CenterMassDlg_moc.cxx \ + MeasureGUI_InertiaDlg_moc.cxx \ + MeasureGUI_BndBoxDlg_moc.cxx \ + MeasureGUI_DistanceDlg_moc.cxx \ + MeasureGUI_MaxToleranceDlg_moc.cxx \ + MeasureGUI_WhatisDlg_moc.cxx \ + MeasureGUI_CheckShapeDlg_moc.cxx \ + MeasureGUI_CheckCompoundOfBlocksDlg_moc.cxx \ + MeasureGUI_PointDlg_moc.cxx + +nodist_libMeasureGUI_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libMeasureGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libMeasureGUI_la_LDFLAGS = \ + ../GEOMBase/libGEOMBase.la + diff --git a/src/MeasureGUI/Makefile.in b/src/MeasureGUI/Makefile.in deleted file mode 100644 index 7c3f45974..000000000 --- a/src/MeasureGUI/Makefile.in +++ /dev/null @@ -1,92 +0,0 @@ -# GEOM MEASUREGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# Libraries targets -LIB = libMeasureGUI.la - -LIB_SRC = MeasureGUI.cxx \ - MeasureGUI_Skeleton_QTD.cxx \ - MeasureGUI_1Sel3LineEdit_QTD.cxx \ - MeasureGUI_1Sel6LineEdit_QTD.cxx \ - MeasureGUI_1Sel12LineEdit_QTD.cxx \ - MeasureGUI_1Sel1TextView_QTD.cxx \ - MeasureGUI_2Sel1LineEdit_QTD.cxx \ - MeasureGUI_Skeleton.cxx \ - MeasureGUI_PropertiesDlg.cxx \ - MeasureGUI_CenterMassDlg.cxx \ - MeasureGUI_InertiaDlg.cxx \ - MeasureGUI_BndBoxDlg.cxx \ - MeasureGUI_DistanceDlg.cxx \ - MeasureGUI_MaxToleranceDlg.cxx \ - MeasureGUI_WhatisDlg.cxx \ - MeasureGUI_CheckShapeDlg.cxx \ - MeasureGUI_CheckCompoundOfBlocksDlg.cxx \ - MeasureGUI_PointDlg.cxx - -LIB_MOC = \ - MeasureGUI_Skeleton_QTD.h \ - MeasureGUI_1Sel3LineEdit_QTD.h \ - MeasureGUI_1Sel6LineEdit_QTD.h \ - MeasureGUI_1Sel12LineEdit_QTD.h \ - MeasureGUI_1Sel1TextView_QTD.h \ - MeasureGUI_2Sel1LineEdit_QTD.h \ - MeasureGUI_Skeleton.h \ - MeasureGUI_PropertiesDlg.h \ - MeasureGUI_CenterMassDlg.h \ - MeasureGUI_InertiaDlg.h \ - MeasureGUI_BndBoxDlg.h \ - MeasureGUI_DistanceDlg.h \ - MeasureGUI_MaxToleranceDlg.h \ - MeasureGUI_WhatisDlg.h \ - MeasureGUI_CheckShapeDlg.h \ - MeasureGUI_CheckCompoundOfBlocksDlg.h \ - MeasureGUI_PointDlg.h - -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMBase - -@CONCLUDE@ diff --git a/src/NMTAlgo/Makefile.in b/src/NMTAlgo/Makefile.am similarity index 73% rename from src/NMTAlgo/Makefile.in rename to src/NMTAlgo/Makefile.am index 867d63cbb..9968f3522 100644 --- a/src/NMTAlgo/Makefile.in +++ b/src/NMTAlgo/Makefile.am @@ -23,20 +23,23 @@ # # File : Makefile.in # Author : Julia DOROVSKIKH +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ +include $(top_srcdir)/adm_local/unix/make_common_starter.am - -@COMMENCE@ +# header files +salomeinclude_HEADERS = \ + NMTAlgo_Splitter1.hxx \ + NMTAlgo_Splitter.hxx \ + NMTAlgo_Builder.hxx \ + NMTAlgo_Algo.hxx # Libraries targets -LIB = libNMTAlgo.la -LIB_SRC = \ +lib_LTLIBRARIES = libNMTAlgo.la + +dist_libNMTAlgo_la_SOURCES = \ NMTAlgo_Algo.cxx \ NMTAlgo_Builder.cxx \ NMTAlgo_Loop3d.cxx \ @@ -46,25 +49,15 @@ LIB_SRC = \ NMTAlgo_Splitter_2.cxx \ NMTAlgo_Tools.cxx -LIB_CLIENT_IDL = -LIB_SERVER_IDL = - -# header files -EXPORT_HEADERS = \ - NMTAlgo_Splitter1.hxx \ - NMTAlgo_Splitter.hxx \ - NMTAlgo_Builder.hxx \ - NMTAlgo_Algo.hxx - -# idl files -EXPORT_IDLS= - - -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools $(KERNEL_LDFLAGS) - -%_moc.cxx: %.h - $(MOC) $< -o $@ - -@CONCLUDE@ +# additionnal information to compil and link file +libNMTAlgo_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../NMTDS \ + -I$(srcdir)/../NMTTools + +libNMTAlgo_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKBool -lTKBO \ + $(KERNEL_LDFLAGS) \ + ../NMTTools/libNMTTools.la diff --git a/src/NMTDS/Makefile.in b/src/NMTDS/Makefile.am similarity index 91% rename from src/NMTDS/Makefile.in rename to src/NMTDS/Makefile.am index 23f815f85..7f5d642a9 100644 --- a/src/NMTDS/Makefile.in +++ b/src/NMTDS/Makefile.am @@ -23,56 +23,14 @@ # # File : Makefile.in # Author : Julia DOROVSKIKH +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - -# Libraries targets -LIB = libNMTDS.la - -LIB_SRC = \ - NMTDS_CArray1OfIndexRange_0.cxx \ - NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx \ - NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx \ - NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx \ - NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx \ - NMTDS_IndexedDataMapOfIntegerShape_0.cxx \ - NMTDS_IndexedDataMapOfShapeBox_0.cxx \ - NMTDS_IndexRange.cxx \ - NMTDS_Iterator.cxx \ - NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx \ - NMTDS_ListIteratorOfListOfPassKey_0.cxx \ - NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx \ - NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx \ - NMTDS_ListNodeOfListOfPassKey_0.cxx \ - NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx \ - NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx \ - NMTDS_ListOfPassKey_0.cxx \ - NMTDS_ListOfPassKeyBoolean_0.cxx \ - NMTDS_MapIteratorOfMapOfPassKey_0.cxx \ - NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx \ - NMTDS_MapOfPassKey_0.cxx \ - NMTDS_MapOfPassKeyBoolean_0.cxx \ - NMTDS_PassKeyBoolean.cxx \ - NMTDS_PassKey.cxx \ - NMTDS_PassKeyMapHasher.cxx \ - NMTDS_ShapesDataStructure.cxx \ - NMTDS_StdMapNodeOfMapOfPassKey_0.cxx \ - NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx \ - NMTDS_BoxBndTree.cxx - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS = \ +salomeinclude_HEADERS = \ Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx \ Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx \ Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx \ @@ -112,15 +70,46 @@ EXPORT_HEADERS = \ NMTDS_StdMapNodeOfMapOfPassKey.hxx \ NMTDS_BoxBndTree.hxx -# idl files -EXPORT_IDLS= +# Libraries targets +lib_LTLIBRARIES = libNMTDS.la +dist_libNMTDS_la_SOURCES = \ + NMTDS_CArray1OfIndexRange_0.cxx \ + NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx \ + NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx \ + NMTDS_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx \ + NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx \ + NMTDS_IndexedDataMapOfIntegerShape_0.cxx \ + NMTDS_IndexedDataMapOfShapeBox_0.cxx \ + NMTDS_IndexRange.cxx \ + NMTDS_Iterator.cxx \ + NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx \ + NMTDS_ListIteratorOfListOfPassKey_0.cxx \ + NMTDS_ListIteratorOfListOfPassKeyBoolean_0.cxx \ + NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx \ + NMTDS_ListNodeOfListOfPassKey_0.cxx \ + NMTDS_ListNodeOfListOfPassKeyBoolean_0.cxx \ + NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx \ + NMTDS_ListOfPassKey_0.cxx \ + NMTDS_ListOfPassKeyBoolean_0.cxx \ + NMTDS_MapIteratorOfMapOfPassKey_0.cxx \ + NMTDS_MapIteratorOfMapOfPassKeyBoolean_0.cxx \ + NMTDS_MapOfPassKey_0.cxx \ + NMTDS_MapOfPassKeyBoolean_0.cxx \ + NMTDS_PassKeyBoolean.cxx \ + NMTDS_PassKey.cxx \ + NMTDS_PassKeyMapHasher.cxx \ + NMTDS_ShapesDataStructure.cxx \ + NMTDS_StdMapNodeOfMapOfPassKey_0.cxx \ + NMTDS_StdMapNodeOfMapOfPassKeyBoolean_0.cxx \ + NMTDS_BoxBndTree.cxx -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO $(KERNEL_LDFLAGS) +# additionnal information to compil and link file -%_moc.cxx: %.h - $(MOC) $< -o $@ +libNMTDS_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) -@CONCLUDE@ +libNMTDS_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKBool -lTKBO diff --git a/src/NMTTools/Makefile.in b/src/NMTTools/Makefile.am similarity index 90% rename from src/NMTTools/Makefile.in rename to src/NMTTools/Makefile.am index 0e8cd2abd..67fa6c114 100644 --- a/src/NMTTools/Makefile.in +++ b/src/NMTTools/Makefile.am @@ -23,65 +23,14 @@ # # File : Makefile.in # Author : Julia DOROVSKIKH +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - -# Libraries targets -LIB = libNMTTools.la -LIB_SRC = \ - NMTTools_CommonBlockAPI.cxx \ - NMTTools_CommonBlock.cxx \ - NMTTools_CommonBlockPool_0.cxx \ - NMTTools_CoupleOfShape.cxx \ - NMTTools_DEProcessor.cxx \ - NMTTools_DSFiller.cxx \ - NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx \ - NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx \ - NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx \ - NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx \ - NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx \ - NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx \ - NMTTools_IteratorOfCoupleOfShape.cxx \ - NMTTools_ListIteratorOfListOfCommonBlock_0.cxx \ - NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx \ - NMTTools_ListNodeOfListOfCommonBlock_0.cxx \ - NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx \ - NMTTools_ListOfCommonBlock_0.cxx \ - NMTTools_ListOfCoupleOfShape_0.cxx \ - NMTTools_PaveFiller_0.cxx \ - NMTTools_PaveFiller_1.cxx \ - NMTTools_PaveFiller_2.cxx \ - NMTTools_PaveFiller_3.cxx \ - NMTTools_PaveFiller_4.cxx \ - NMTTools_PaveFiller_5.cxx \ - NMTTools_PaveFiller_6.cxx \ - NMTTools_PaveFiller_7.cxx \ - NMTTools_PaveFiller_8.cxx \ - NMTTools_PaveFiller_9.cxx \ - NMTTools_PaveFiller.cxx \ - NMTTools_PCurveMaker.cxx \ - NMTTools_Tools.cxx \ - NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx \ - NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx \ - NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx \ - NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx \ - NMTTools_MapOfPaveBlock_0.cxx \ - NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx - - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS = \ +salomeinclude_HEADERS = \ Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx \ Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx \ Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx \ @@ -89,7 +38,6 @@ EXPORT_HEADERS = \ Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx \ Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx \ Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx \ - NMTDS_Iterator.hxx \ NMTTools_CommonBlockAPI.hxx \ NMTTools_CommonBlock.hxx \ NMTTools_CommonBlockPool.hxx \ @@ -123,15 +71,58 @@ EXPORT_HEADERS = \ NMTTools_MapOfPaveBlock.hxx \ NMTTools_StdMapNodeOfMapOfPaveBlock.hxx -# idl files -EXPORT_IDLS= +# Libraries targets +lib_LTLIBRARIES = libNMTTools.la +dist_libNMTTools_la_SOURCES = \ + NMTTools_CommonBlockAPI.cxx \ + NMTTools_CommonBlock.cxx \ + NMTTools_CommonBlockPool_0.cxx \ + NMTTools_CoupleOfShape.cxx \ + NMTTools_DEProcessor.cxx \ + NMTTools_DSFiller.cxx \ + NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx \ + NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx \ + NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx \ + NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx \ + NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx \ + NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx \ + NMTTools_IteratorOfCoupleOfShape.cxx \ + NMTTools_ListIteratorOfListOfCommonBlock_0.cxx \ + NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx \ + NMTTools_ListNodeOfListOfCommonBlock_0.cxx \ + NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx \ + NMTTools_ListOfCommonBlock_0.cxx \ + NMTTools_ListOfCoupleOfShape_0.cxx \ + NMTTools_PaveFiller_0.cxx \ + NMTTools_PaveFiller_1.cxx \ + NMTTools_PaveFiller_2.cxx \ + NMTTools_PaveFiller_3.cxx \ + NMTTools_PaveFiller_4.cxx \ + NMTTools_PaveFiller_5.cxx \ + NMTTools_PaveFiller_6.cxx \ + NMTTools_PaveFiller_7.cxx \ + NMTTools_PaveFiller_8.cxx \ + NMTTools_PaveFiller_9.cxx \ + NMTTools_PaveFiller.cxx \ + NMTTools_PCurveMaker.cxx \ + NMTTools_Tools.cxx \ + NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock_0.cxx \ + NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock_0.cxx \ + NMTTools_DataMapOfIntegerListOfPaveBlock_0.cxx \ + NMTTools_MapIteratorOfMapOfPaveBlock_0.cxx \ + NMTTools_MapOfPaveBlock_0.cxx \ + NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS $(KERNEL_LDFLAGS) +# additionnal information to compil and link file -%_moc.cxx: %.h - $(MOC) $< -o $@ +libNMTTools_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../NMTDS -@CONCLUDE@ +libNMTTools_la_LDFLAGS = \ + ../NMTDS/libNMTDS.la \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKBool -lTKBO \ + $(KERNEL_LDFLAGS) diff --git a/src/NMTTools/NMTDS_Iterator.hxx b/src/NMTTools/NMTDS_Iterator.hxx deleted file mode 100644 index 158a35892..000000000 --- a/src/NMTTools/NMTDS_Iterator.hxx +++ /dev/null @@ -1,138 +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 - -#ifndef _NMTDS_Iterator_HeaderFile -#define _NMTDS_Iterator_HeaderFile - -#ifndef _NMTDS_PShapesDataStructure_HeaderFile -#include -#endif -#ifndef _NMTDS_ListOfPassKeyBoolean_HeaderFile -#include -#endif -#ifndef _NMTDS_ListIteratorOfListOfPassKeyBoolean_HeaderFile -#include -#endif -#ifndef _Standard_Integer_HeaderFile -#include -#endif -#ifndef _TopAbs_ShapeEnum_HeaderFile -#include -#endif -#ifndef _Standard_Boolean_HeaderFile -#include -#endif -class NMTDS_ShapesDataStructure; - - -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_Macro_HeaderFile -#include -#endif - - -class NMTDS_Iterator { - -public: - - void* operator new(size_t,void* anAddress) - { - return anAddress; - } - void* operator new(size_t size) - { - return Standard::Allocate(size); - } - void operator delete(void *anAddress) - { - if (anAddress) Standard::Free((Standard_Address&)anAddress); - } - // Methods PUBLIC - // - - -Standard_EXPORT NMTDS_Iterator(); -Standard_EXPORT virtual ~NMTDS_Iterator(); - - -Standard_EXPORT void SetDS(const NMTDS_PShapesDataStructure& pDS) ; - - -Standard_EXPORT const NMTDS_ShapesDataStructure& DS() const; - - -Standard_EXPORT void Initialize(const TopAbs_ShapeEnum aType1,const TopAbs_ShapeEnum aType2) ; - - -Standard_EXPORT Standard_Boolean More() const; - - -Standard_EXPORT void Next() ; - - -Standard_EXPORT void Current(Standard_Integer& aIndex1,Standard_Integer& aIndex2,Standard_Boolean& aWithSubShape) const; - - -Standard_EXPORT void Prepare() ; - - -Standard_EXPORT Standard_Integer ExpectedLength() const; - - - - - -protected: - - // Methods PROTECTED - // - - - // Fields PROTECTED - // -NMTDS_PShapesDataStructure myPDS; -NMTDS_ListOfPassKeyBoolean myLists[6]; -NMTDS_ListIteratorOfListOfPassKeyBoolean myIterator; -NMTDS_ListOfPassKeyBoolean myEmptyList; -Standard_Integer myLength; - - -private: - - // Methods PRIVATE - // - - - // Fields PRIVATE - // - - -}; - - - - - -// other Inline functions and methods (like "C++: function call" methods) -// - - -#endif diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am new file mode 100644 index 000000000..db262c7f0 --- /dev/null +++ b/src/OBJECT/Makefile.am @@ -0,0 +1,75 @@ +# GEOM OBJECT : interactive object for Geometry entities 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 +# Author : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = \ + GEOM_Actor.h \ + GEOM_AssemblyBuilder.h \ + GEOM_AISShape.hxx \ + Handle_GEOM_AISShape.hxx \ + GEOM_InteractiveObject.hxx \ + Handle_GEOM_InteractiveObject.hxx \ + GEOM_AISTrihedron.hxx \ + GEOM_VTKTrihedron.hxx \ + GEOM_OBJECT_defs.hxx + +# Libraries targets +lib_LTLIBRARIES = libGEOMObject.la + +dist_libGEOMObject_la_SOURCES = \ + GEOM_Actor.cxx \ + GEOM_OCCReader.cxx \ + GEOM_AssemblyBuilder.cxx \ + GEOM_AISShape.cxx \ + GEOM_InteractiveObject.cxx \ + GEOM_AISTrihedron.cxx \ + GEOM_VTKTrihedron.cxx + + +libGEOMObject_la_CPPFLAGS = \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(QT_INCLUDES) \ + $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(VTK_INCLUDES) \ + $(OGL_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) + +libGEOMObject_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(GUI_LDFLAGS) -lqtx -lVTKViewer -lSVTK -lSalomeObject +# $(CORBA_LIBS) \ +# $(STDLIB) \ +# $(PYTHON_LIBS) \ +# $(QT_MT_LIBS) \ +# $(VTK_LIBS) \ +# $(OGL_LIBS) diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in deleted file mode 100644 index 3ca29fdce..000000000 --- a/src/OBJECT/Makefile.in +++ /dev/null @@ -1,69 +0,0 @@ -# GEOM OBJECT : interactive object for Geometry entities 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 : GEOM - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -EXPORT_HEADERS = GEOM_Actor.h \ - GEOM_AssemblyBuilder.h \ - GEOM_AISShape.hxx \ - Handle_GEOM_AISShape.hxx \ - GEOM_InteractiveObject.hxx \ - Handle_GEOM_InteractiveObject.hxx \ - GEOM_AISTrihedron.hxx \ - GEOM_VTKTrihedron.hxx \ - GEOM_OBJECT_defs.hxx - -# Libraries targets - -LIB = libGEOMObject.la -LIB_SRC = GEOM_Actor.cxx \ - GEOM_OCCReader.cxx \ - GEOM_AssemblyBuilder.cxx \ - GEOM_AISShape.cxx \ - GEOM_InteractiveObject.cxx \ - GEOM_AISTrihedron.cxx \ - GEOM_VTKTrihedron.cxx - -LIB_CLIENT_IDL = - -# Executables targets -BIN = -BIN_SRC = - -CPPFLAGS += $(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -%_moc.cxx: %.h - $(MOC) $< -o $@ - - -@CONCLUDE@ diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am new file mode 100644 index 000000000..58044b1d2 --- /dev/null +++ b/src/OperationGUI/Makefile.am @@ -0,0 +1,85 @@ +# GEOM OPERATIONGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libOperationGUI.la + +dist_libOperationGUI_la_SOURCES = \ + OperationGUI.cxx \ + OperationGUI_ArchimedeDlg.cxx \ + OperationGUI_PartitionDlg.cxx \ + OperationGUI_MaterialDlg.cxx \ + OperationGUI_FilletDlg.cxx \ + OperationGUI_ChamferDlg.cxx \ + OperationGUI_ClippingDlg.cxx + +MOC_FILES = \ + OperationGUI_ArchimedeDlg_moc.cxx \ + OperationGUI_PartitionDlg_moc.cxx \ + OperationGUI_MaterialDlg_moc.cxx \ + OperationGUI_FilletDlg_moc.cxx \ + OperationGUI_ChamferDlg_moc.cxx \ + OperationGUI_ClippingDlg_moc.cxx + +nodist_libOperationGUI_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libOperationGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libOperationGUI_la_LDFLAGS = \ + ../GEOMBase/libGEOMBase.la \ + $(CAS_LDPATH) -lTKFillet diff --git a/src/OperationGUI/Makefile.in b/src/OperationGUI/Makefile.in deleted file mode 100644 index c079fa8e4..000000000 --- a/src/OperationGUI/Makefile.in +++ /dev/null @@ -1,70 +0,0 @@ -# GEOM OPERATIONGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# Libraries targets -LIB = libOperationGUI.la - -LIB_SRC = OperationGUI.cxx \ - OperationGUI_ArchimedeDlg.cxx \ - OperationGUI_PartitionDlg.cxx \ - OperationGUI_MaterialDlg.cxx \ - OperationGUI_FilletDlg.cxx \ - OperationGUI_ChamferDlg.cxx \ - OperationGUI_ClippingDlg.cxx - -LIB_MOC = \ - OperationGUI_ArchimedeDlg.h \ - OperationGUI_PartitionDlg.h \ - OperationGUI_MaterialDlg.h \ - OperationGUI_FilletDlg.h \ - OperationGUI_ChamferDlg.h \ - OperationGUI_ClippingDlg.h - -LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += $(CAS_LDPATH) -lTKFillet -lGEOMBase - -@CONCLUDE@ diff --git a/src/PrimitiveGUI/Makefile.am b/src/PrimitiveGUI/Makefile.am new file mode 100644 index 000000000..4ca0d8793 --- /dev/null +++ b/src/PrimitiveGUI/Makefile.am @@ -0,0 +1,83 @@ +# GEOM PRIMITIVEGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libPrimitiveGUI.la + +dist_libPrimitiveGUI_la_SOURCES = \ + PrimitiveGUI.cxx \ + PrimitiveGUI_BoxDlg.cxx \ + PrimitiveGUI_CylinderDlg.cxx \ + PrimitiveGUI_SphereDlg.cxx \ + PrimitiveGUI_TorusDlg.cxx \ + PrimitiveGUI_ConeDlg.cxx + +MOC_FILES = \ + PrimitiveGUI_BoxDlg_moc.cxx \ + PrimitiveGUI_CylinderDlg_moc.cxx \ + PrimitiveGUI_SphereDlg_moc.cxx \ + PrimitiveGUI_TorusDlg_moc.cxx \ + PrimitiveGUI_ConeDlg_moc.cxx + +nodist_libPrimitiveGUI_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libPrimitiveGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libPrimitiveGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la diff --git a/src/PrimitiveGUI/Makefile.in b/src/PrimitiveGUI/Makefile.in deleted file mode 100644 index b56bbab13..000000000 --- a/src/PrimitiveGUI/Makefile.in +++ /dev/null @@ -1,68 +0,0 @@ -# GEOM PRIMITIVEGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# Libraries targets -LIB = libPrimitiveGUI.la - -LIB_SRC = PrimitiveGUI.cxx \ - PrimitiveGUI_BoxDlg.cxx \ - PrimitiveGUI_CylinderDlg.cxx \ - PrimitiveGUI_SphereDlg.cxx \ - PrimitiveGUI_TorusDlg.cxx \ - PrimitiveGUI_ConeDlg.cxx - -LIB_MOC = \ - PrimitiveGUI_BoxDlg.h \ - PrimitiveGUI_CylinderDlg.h \ - PrimitiveGUI_SphereDlg.h \ - PrimitiveGUI_TorusDlg.h \ - PrimitiveGUI_ConeDlg.h - -LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection -lGEOMBase - -@CONCLUDE@ diff --git a/src/RepairGUI/Makefile.am b/src/RepairGUI/Makefile.am new file mode 100644 index 000000000..f406ab997 --- /dev/null +++ b/src/RepairGUI/Makefile.am @@ -0,0 +1,94 @@ +# GEOM REPAIRGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libRepairGUI.la + +dist_libRepairGUI_la_SOURCES = \ + RepairGUI.cxx \ + RepairGUI_SewingDlg.cxx \ + RepairGUI_SuppressFacesDlg.cxx \ + RepairGUI_ShapeProcessDlg.cxx \ + RepairGUI_CloseContourDlg.cxx \ + RepairGUI_RemoveIntWiresDlg.cxx \ + RepairGUI_RemoveHolesDlg.cxx \ + RepairGUI_DivideEdgeDlg.cxx \ + RepairGUI_FreeBoundDlg.cxx \ + RepairGUI_FreeFacesDlg.cxx \ + RepairGUI_ChangeOrientationDlg.cxx \ + RepairGUI_GlueDlg.cxx + +MOC_FILES = \ + RepairGUI_SewingDlg_moc.cxx \ + RepairGUI_SuppressFacesDlg_moc.cxx \ + RepairGUI_ShapeProcessDlg_moc.cxx \ + RepairGUI_CloseContourDlg_moc.cxx \ + RepairGUI_RemoveIntWiresDlg_moc.cxx \ + RepairGUI_RemoveHolesDlg_moc.cxx \ + RepairGUI_DivideEdgeDlg_moc.cxx \ + RepairGUI_FreeBoundDlg_moc.cxx \ + RepairGUI_FreeFacesDlg_moc.cxx \ + RepairGUI_ChangeOrientationDlg_moc.cxx \ + RepairGUI_GlueDlg_moc.cxx + +nodist_libRepairGUI_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libRepairGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libRepairGUI_la_LDFLAGS = \ + ../GEOMBase/libGEOMBase.la diff --git a/src/RepairGUI/Makefile.in b/src/RepairGUI/Makefile.in deleted file mode 100644 index b5aec03e1..000000000 --- a/src/RepairGUI/Makefile.in +++ /dev/null @@ -1,80 +0,0 @@ -# GEOM REPAIRGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# Libraries targets -LIB = libRepairGUI.la - -LIB_SRC = RepairGUI.cxx \ - RepairGUI_SewingDlg.cxx \ - RepairGUI_SuppressFacesDlg.cxx \ - RepairGUI_ShapeProcessDlg.cxx \ - RepairGUI_CloseContourDlg.cxx \ - RepairGUI_RemoveIntWiresDlg.cxx \ - RepairGUI_RemoveHolesDlg.cxx \ - RepairGUI_DivideEdgeDlg.cxx \ - RepairGUI_FreeBoundDlg.cxx \ - RepairGUI_FreeFacesDlg.cxx \ - RepairGUI_ChangeOrientationDlg.cxx \ - RepairGUI_GlueDlg.cxx - -LIB_MOC = \ - RepairGUI_SewingDlg.h \ - RepairGUI_SuppressFacesDlg.h \ - RepairGUI_ShapeProcessDlg.h \ - RepairGUI_CloseContourDlg.h \ - RepairGUI_RemoveIntWiresDlg.h \ - RepairGUI_RemoveHolesDlg.h \ - RepairGUI_DivideEdgeDlg.h \ - RepairGUI_FreeBoundDlg.h \ - RepairGUI_FreeFacesDlg.h \ - RepairGUI_ChangeOrientationDlg.h \ - RepairGUI_GlueDlg.h - -LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMBase - -@CONCLUDE@ diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.am similarity index 71% rename from src/SKETCHER/Makefile.in rename to src/SKETCHER/Makefile.am index 70751d243..92dde135b 100644 --- a/src/SKETCHER/Makefile.in +++ b/src/SKETCHER/Makefile.am @@ -23,29 +23,30 @@ # # File : Makefile.in # Author : Patrick GOLDBRONN (CEA) +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header$ -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl +include $(top_srcdir)/adm_local/unix/make_common_starter.am -@COMMENCE@ +# header files +salomeinclude_HEADERS = \ + Sketcher_Profile.hxx # Libraries targets -LIB = libGEOMSketcher.la -LIB_SRC = Sketcher_Profile.cxx -LIB_CLIENT_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj.idl +lib_LTLIBRARIES = libGEOMSketcher.la -# header files -EXPORT_HEADERS= Sketcher_Profile.hxx +dist_libGEOMSketcher_la_SOURCES = \ + Sketcher_Profile.cxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS) - -@CONCLUDE@ - +libGEOMSketcher_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) + +libGEOMSketcher_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_KERNEL) \ + $(CAS_MODELER) diff --git a/src/STEPExport/Makefile.am b/src/STEPExport/Makefile.am new file mode 100644 index 000000000..66467dfa7 --- /dev/null +++ b/src/STEPExport/Makefile.am @@ -0,0 +1,46 @@ +# 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 : Pavel TELKOV +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libSTEPExport.la + +dist_libSTEPExport_la_SOURCES = \ + STEPExport.cxx + +# additionnal information to compil and link file +libSTEPExport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) + +libSTEPExport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKSTEP diff --git a/src/STEPExport/Makefile.in b/src/STEPExport/Makefile.in deleted file mode 100644 index 067efe76a..000000000 --- a/src/STEPExport/Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -# 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 : Pavel TELKOV -# Module : GEOM -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -# Libraries targets - -LIB= libSTEPExport.la - -LIB_SRC = STEPExport.cxx - -# additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS) - -@CONCLUDE@ diff --git a/src/STEPImport/Makefile.am b/src/STEPImport/Makefile.am new file mode 100644 index 000000000..7fd6d51f3 --- /dev/null +++ b/src/STEPImport/Makefile.am @@ -0,0 +1,46 @@ +# 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 : Pavel TELKOV +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header$ + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libSTEPImport.la + +dist_libSTEPImport_la_SOURCES = \ + STEPImport.cxx + +# additionnal information to compil and link file +libSTEPImport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) + +libSTEPImport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKSTEP diff --git a/src/STEPImport/Makefile.in b/src/STEPImport/Makefile.in deleted file mode 100644 index 5ecf12150..000000000 --- a/src/STEPImport/Makefile.in +++ /dev/null @@ -1,45 +0,0 @@ -# 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 : Pavel TELKOV -# Module : GEOM -# $Header$ - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - -@COMMENCE@ - -# Libraries targets - -LIB= libSTEPImport.la - -LIB_SRC = STEPImport.cxx - -# additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) - -LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS) - -@CONCLUDE@ diff --git a/src/ShHealOper/Makefile.in b/src/ShHealOper/Makefile.am similarity index 77% rename from src/ShHealOper/Makefile.in rename to src/ShHealOper/Makefile.am index 2497fc526..bb8409246 100644 --- a/src/ShHealOper/Makefile.in +++ b/src/ShHealOper/Makefile.am @@ -23,38 +23,14 @@ # # File : Makefile.in # Author : Alexander SLADKOV +# Modified by : Alexander BORODIN (OCN) - autotools usage # Module : GEOM # $Header: -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - - -@COMMENCE@ - -# Libraries targets -LIB = libShHealOper.la - -LIB_SRC = \ - ShHealOper_CloseContour.cxx \ - ShHealOper_EdgeDivide.cxx \ - ShHealOper_FillHoles.cxx \ - ShHealOper_RemoveFace.cxx \ - ShHealOper_RemoveInternalWires.cxx \ - ShHealOper_Sewing.cxx \ - ShHealOper_ShapeProcess.cxx \ - ShHealOper_SplitCurve2d.cxx \ - ShHealOper_SplitCurve3d.cxx \ - ShHealOper_ChangeOrientation.cxx \ - ShHealOper_Tool.cxx \ - -LIB_CLIENT_IDL = -LIB_SERVER_IDL = +include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -EXPORT_HEADERS = \ +salomeinclude_HEADERS = \ ShHealOper_CloseContour.hxx \ ShHealOper_EdgeDivide.hxx \ ShHealOper_FillHoles.hxx \ @@ -68,15 +44,31 @@ EXPORT_HEADERS = \ ShHealOper_ChangeOrientation.hxx \ ShHealOper_Tool.hxx -# idl files -EXPORT_IDLS= +# Libraries targets +lib_LTLIBRARIES = libShHealOper.la -CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +dist_libShHealOper_la_SOURCES = \ + ShHealOper_CloseContour.cxx \ + ShHealOper_EdgeDivide.cxx \ + ShHealOper_FillHoles.cxx \ + ShHealOper_RemoveFace.cxx \ + ShHealOper_RemoveInternalWires.cxx \ + ShHealOper_Sewing.cxx \ + ShHealOper_ShapeProcess.cxx \ + ShHealOper_SplitCurve2d.cxx \ + ShHealOper_SplitCurve3d.cxx \ + ShHealOper_ChangeOrientation.cxx \ + ShHealOper_Tool.cxx -LDFLAGS += $(CAS_KERNEL) $(CAS_MATH) $(CAS_TKTopAlgo) $(CAS_LDPATH) -lTKBool -lTKShHealing +# additionnal information to compil and link file -%_moc.cxx: %.h - $(MOC) $< -o $@ +libShHealOper_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) -@CONCLUDE@ +libShHealOper_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_KERNEL) \ + $(CAS_MATH) \ + $(CAS_TKTopAlgo) \ + $(CAS_LDPATH) -lTKBool -lTKShHealing -lTKLCAF diff --git a/src/TransformationGUI/Makefile.am b/src/TransformationGUI/Makefile.am new file mode 100644 index 000000000..b980ea75a --- /dev/null +++ b/src/TransformationGUI/Makefile.am @@ -0,0 +1,90 @@ +# GEOM TRANSFORMATIONGUI : +# +# 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 : Damien COQUERET (OCC) +# Modified by : Alexander BORODIN (OCN) - autotools usage +# Module : GEOM +# $Header: + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +# header files +salomeinclude_HEADERS = + +# Libraries targets +lib_LTLIBRARIES = libTransformationGUI.la + +dist_libTransformationGUI_la_SOURCES = \ + TransformationGUI.cxx \ + TransformationGUI_MultiTranslationDlg.cxx \ + TransformationGUI_MultiRotationDlg.cxx \ + TransformationGUI_TranslationDlg.cxx \ + TransformationGUI_RotationDlg.cxx \ + TransformationGUI_MirrorDlg.cxx \ + TransformationGUI_ScaleDlg.cxx \ + TransformationGUI_OffsetDlg.cxx \ + TransformationGUI_PositionDlg.cxx + +MOC_FILES = \ + TransformationGUI_MultiTranslationDlg_moc.cxx \ + TransformationGUI_MultiRotationDlg_moc.cxx \ + TransformationGUI_TranslationDlg_moc.cxx \ + TransformationGUI_RotationDlg_moc.cxx \ + TransformationGUI_MirrorDlg_moc.cxx \ + TransformationGUI_ScaleDlg_moc.cxx \ + TransformationGUI_OffsetDlg_moc.cxx \ + TransformationGUI_PositionDlg_moc.cxx + +nodist_libTransformationGUI_la_SOURCES= \ + $(MOC_FILES) + +#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl + +#LIB_SERVER_IDL = + +# additionnal information to compil and link file + +libTransformationGUI_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(VTK_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(PYTHON_INCLUDES) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(GUI_CXXFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../DlgRef \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../OBJECT \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMFiltersSelection \ + -I$(top_builddir)/idl \ + -I$(top_builddir)/salome_adm/unix + +libTransformationGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ + ../GEOMBase/libGEOMBase.la diff --git a/src/TransformationGUI/Makefile.in b/src/TransformationGUI/Makefile.in deleted file mode 100644 index 6630d8531..000000000 --- a/src/TransformationGUI/Makefile.in +++ /dev/null @@ -1,74 +0,0 @@ -# GEOM TRANSFORMATIONGUI : -# -# 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 : Damien COQUERET (OCC) -# Module : GEOM -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@:@top_srcdir@/idl - - -@COMMENCE@ - -# header files -EXPORT_HEADERS= - -# Libraries targets -LIB = libTransformationGUI.la - -LIB_SRC = TransformationGUI.cxx \ - TransformationGUI_MultiTranslationDlg.cxx \ - TransformationGUI_MultiRotationDlg.cxx \ - TransformationGUI_TranslationDlg.cxx \ - TransformationGUI_RotationDlg.cxx \ - TransformationGUI_MirrorDlg.cxx \ - TransformationGUI_ScaleDlg.cxx \ - TransformationGUI_OffsetDlg.cxx \ - TransformationGUI_PositionDlg.cxx - -LIB_MOC = \ - TransformationGUI_MultiTranslationDlg.h \ - TransformationGUI_MultiRotationDlg.h \ - TransformationGUI_TranslationDlg.h \ - TransformationGUI_RotationDlg.h \ - TransformationGUI_MirrorDlg.h \ - TransformationGUI_ScaleDlg.h \ - TransformationGUI_OffsetDlg.h \ - TransformationGUI_PositionDlg.h - -LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl - -LIB_SERVER_IDL = - -# additionnal information to compil and link file - -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) - -LDFLAGS += -lGEOMFiltersSelection -lGEOMBase - -@CONCLUDE@ -- 2.39.2